Changeset 5591 for issm


Ignore:
Timestamp:
08/26/10 09:47:22 (15 years ago)
Author:
Mathieu Morlighem
Message:

Added check in nightly run, that Matlab did not crash

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/cron/nightlyrun.sh

    r5083 r5591  
    267267                fclose(fid);
    268268        end
     269        disp('MATLABEXITEDCORRECTLY');
    269270        exit
    270271EOF
    … …  
    288289        cat matlab_log.log matlab_log$i.log > matlab_log.log.bak
    289290        mv matlab_log.log.bak matlab_log.log
    290         rm matlab_log$i.log
    291 
    292291done
    293292#}}}
    294293#Complete info.log {{{1
     294if [ $(cat matlab_log.log | grep "MATLABEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ]
     295then
     296        MATLABCRASH=0
     297else
     298        MATLABCRASH=1
     299fi
    295300ELAPSED_RUN=$(timer $INSTALL_TIME)
    296301ELAPSED_TOTAL=$(timer $START_TIME)
    … …  
    298303elapsed_run:   $(echo $ELAPSED_RUN)
    299304elapsed_total: $(echo $ELAPSED_TOTAL)
     305matlab_crash:  $(echo $MATLABCRASH)
    300306END
    301307#}}}

  • issm/trunk/scripts/dailyrun.sh

    r5082 r5591  
    116116                fclose(fid);
    117117        end
     118        disp('MATLABEXITEDCORRECTLY');
    118119        exit
    119120EOF
    … …  
    137138        cat matlab_log.log matlab_log$i.log > matlab_log.log.bak
    138139        mv matlab_log.log.bak matlab_log.log
    139         rm matlab_log$i.log
    140 
    141140done
    142141#}}}
    143142#Complete info.log {{{1
     143if [ $(cat matlab_log.log | grep "MATLABEXITEDCORRECTLY" | wc -l) -eq $NUMCPUS_RUN ]
     144then
     145        MATLABCRASH=0
     146else
     147        MATLABCRASH=1
     148fi
    144149ELAPSED_RUN=$(timer $INSTALL_TIME)
    145150ELAPSED_TOTAL=$(timer $START_TIME)
    … …  
    147152elapsed_run:   $(echo $ELAPSED_RUN)
    148153elapsed_total: $(echo $ELAPSED_TOTAL)
     154matlab_crash:  $(echo $MATLABCRASH)
    149155END
    150156#}}}

  • issm/trunk/scripts/report.sh

    r5082 r5591  
    1515EL_RUN=`    cat info.log | grep "elapsed_run"     | awk '{print $2}'`
    1616EL_TOTAL=`  cat info.log | grep "elapsed_total"   | awk '{print $2}'`
     17CRASH=`     cat info.log | grep "matlab_crash:"   | awk '{print $2}'`
    1718
    1819#Process matlab_log.log
    … …  
    5253else
    5354        IS_INSTALL=1
    54 fi
    55 if [ $(wc -l matlab.log | awk '{printf("%s",$1);}')  -eq 0 ]
    56 then
    57         IS_RUN=0
    58 else
    59         IS_RUN=1
    6055fi
    6156
    … …  
    10095
    10196#update status
    102 if [ $IS_RUN -eq 1 ]
     97if [ $IS_INSTALL -eq 1 ]
    10398then
    104         cat summary.html | sed -e "s/STATUS/<span style=\"color:#008000\">all test desks have been run<\/span>/g" > summary2.html
    105         mv summary2.html summary.html
     99        if [ $CRASH -eq 0 ]
     100        then
     101                cat summary.html | sed -e "s/STATUS/<span style=\"color:#008000\">all test desks have been run<\/span>/g" > summary2.html
     102        else
     103                cat summary.html | sed -e "s/STATUS/<span style=\"color:#ff0000\">installation successful but Matlab crashed<\/span>/g" > summary2.html
     104        fi
    106105else
    107         if [ $IS_INSTALL -eq 1 ]
    108         then
    109                 cat summary.html | sed -e "s/STATUS/<span style=\"color:#ff0000\">installation successful but tests runs failed<\/span>/g" > summary2.html
    110                 mv summary2.html summary.html
    111         else
    112                 cat summary.html | sed -e "s/STATUS/<span style=\"color:#ff0000\">installation failed<\/span>/g" > summary2.html
    113                 mv summary2.html summary.html
    114         fi
     106        cat summary.html | sed -e "s/STATUS/<span style=\"color:#ff0000\">installation failed<\/span>/g" > summary2.html
    115107fi
    116 
     108mv summary2.html summary.html
    117109
    118110#report table
    119 if [ $IS_RUN -eq 1 ];
     111if [ $IS_INSTALL -eq 1 ];
    120112then
    121113        cat << END > content.html
Note: See TracChangeset for help on using the changeset viewer.