Index: /issm/trunk/cron/nightlyrun.sh =================================================================== --- /issm/trunk/cron/nightlyrun.sh (revision 5082) +++ /issm/trunk/cron/nightlyrun.sh (revision 5083) @@ -217,11 +217,11 @@ ln -s $ISSM_DIR/startup.m . #}}} -#Create nightlylog directory and nightly.log {{{1 -#put installation elapsed time in nightly.log +#Create nightlylog directory and info.log {{{1 +#put installation elapsed time in info.log INSTALL_TIME=$(timer) ELAPSED_INSTALL=$(timer $START_TIME) rm -rf $ISSM_DIR/nightlylog mkdir $ISSM_DIR/nightlylog -cat << END > $ISSM_DIR/nightlylog/nightly.log +cat << END > $ISSM_DIR/nightlylog/info.log today: $(echo $TODAY) user: $(echo $USER) @@ -247,5 +247,5 @@ #Launch matlab and the nightly run script cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF - warning off %necessary to avoid a nightly.log of several Go for parallel runs + warning off %necessary to avoid a info.log of several Go for parallel runs try, cd $ISSM_DIR/test/NightlyRun @@ -282,4 +282,5 @@ #}}} #concatenate all reports {{{1 +cd $ISSM_DIR/nightlylog/ mv matlab_log1.log matlab_log.log for (( i=2;i<=$NUMCPUS_RUN;i++ )) @@ -291,8 +292,8 @@ done #}}} -#Complete nightly.log {{{1 +#Complete info.log {{{1 ELAPSED_RUN=$(timer $INSTALL_TIME) ELAPSED_TOTAL=$(timer $START_TIME) -cat << END >> $ISSM_DIR/nightlylog/nightly.log +cat << END >> $ISSM_DIR/nightlylog/info.log elapsed_run: $(echo $ELAPSED_RUN) elapsed_total: $(echo $ELAPSED_TOTAL) @@ -303,5 +304,5 @@ #Build html report {{{1 cd $ISSM_DIR/nightlylog/ -sh ../cron/report.sh +sh ../scripts/report.sh echo "html report located in $ISSM_DIR/nightlylog/report.html" #}}} Index: sm/trunk/cron/report.sh =================================================================== --- /issm/trunk/cron/report.sh (revision 5082) +++ (revision ) @@ -1,200 +1,0 @@ -#!/bin/bash -#generate html report from nightly.log output file - -#----------------------------# -# Initialize local variables # -#----------------------------# - -#process nightly.log -TODAY=` cat nightly.log | grep "today" | awk '{printf("%s %s",$2,$3);}'` -USER=` cat nightly.log | grep "user" | awk '{print $2}'` -HOST_NAME=` cat nightly.log | grep "host" | awk '{print $2}'` -OS=` cat nightly.log | grep "OS" | awk '{print $2}'` -RELEASE=` cat nightly.log | grep "release" | awk '{print $2}'` -EL_INSTALL=`cat nightly.log | grep "elapsed_install" | awk '{print $2}'` -EL_RUN=` cat nightly.log | grep "elapsed_run" | awk '{print $2}'` -EL_TOTAL=` cat nightly.log | grep "elapsed_total" | awk '{print $2}'` - -#Process matlab_log.log -cat matlab_log.log | egrep 'ERROR|SUCCESS|FAILURE' | sed -e "s/>/\>/g" | sed -e "s/ matlab.log -NUM_TOT=`wc -l matlab.log | awk '{print $1}'` -NUM_ERR=`cat matlab.log | grep 'ERROR' | grep -v "PETSC ERROR" | wc -l` -NUM_SUC=`cat matlab.log | grep 'SUCCESS' | wc -l` -NUM_FAI=`cat matlab.log | grep 'FAILURE' | wc -l` - -#style -H1_STYLE='width="1000px" cellpadding="20"' -H1_FONT='style="color:#6495ed; font-family:Arial, Verdana, Tahoma; font-weight: bold; font-size:35px;" align="center"' - -H2_STYLE='width="900px" cellpadding="20"' -H2_FONT='style="color:#6495ed; font-family:Arial, Verdana, Tahoma; font-size:28px; font-weight: bold;" align="left"' - -TABLE_STYLE='width="800px" rules=none bgcolor="#ffffdd" border=1 bordercolor="#000000" cellpadding="3"' -TABLE_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14; font-weight: normal;" align="left"' - -MATLAB_STYLE='width="1000px" rules=none' -MATLAB_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px; font-weight: normal;" align="left"' - -BODY_STYLE='width="800px"' -BODY_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px;"' - -FOOTER_STYLE='width="800px" cellpadding="10"' -FOOTER_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:12px; font-weight: normal;" align="center"' - -#style 2 -BODY_FONTC=`echo $BODY_FONT | sed -e "s/style=\"/style=\"text-align:center; /g"` -BODY_FONTL=`echo $BODY_FONT | sed -e "s/style=\"/style=\"text-align:left; /g"` - -#create some variables -if [ $(ls -1 $ISSM_DIR/bin | wc -l) -le 20 ]; -then - IS_INSTALL=0 -else - IS_INSTALL=1 -fi -if [ $(wc -l matlab.log | awk '{printf("%s",$1);}') -eq 0 ] -then - IS_RUN=0 -else - IS_RUN=1 -fi - -#-------------------# -# build report.html # -#-------------------# - -#first: summary -cat << END > summary.html -
-
ISSM Nightly run report
- - - - - - - - - - - - - - - - - - - - - - - -
host: $HOST_NAMEdate: $TODAY
OS: $OSuser: $USER
status: STATUSrelease: $RELEASE
number of success: $NUM_SUC/$NUM_TOT -total elapsed time: $EL_TOTAL
number of errors: $NUM_ERR/$NUM_TOT - -installation elapsed time: $EL_INSTALL
number of failures: $NUM_FAI/$NUM_TOT -execution elapsed time: $EL_RUN
-
-END - -#update status -if [ $IS_RUN -eq 1 ] -then - cat summary.html | sed -e "s/STATUS/all test desks have been run<\/span>/g" > summary2.html - mv summary2.html summary.html -else - if [ $IS_INSTALL -eq 1 ] - then - cat summary.html | sed -e "s/STATUS/installation successful but tests runs failed<\/span>/g" > summary2.html - mv summary2.html summary.html - else - cat summary.html | sed -e "s/STATUS/installation failed<\/span>/g" > summary2.html - mv summary2.html summary.html - fi -fi - - -#report table -if [ $IS_RUN -eq 1 ]; -then - cat << END > content.html -
List of tests
- - - - - - - - -$(cat matlab.log | while read line - do - echo "" - - #get status - STATUS=`echo $line | awk '{print $1}'` - - #FAILURE - if [ "$STATUS" = "FAILURE" ] - then - - FONTC=$(echo "$BODY_FONTC bgcolor=#ffff00"); - FONTL=$(echo "$BODY_FONTL bgcolor=#ffff00"); - echo $line | awk -v FONTC="$FONTC" -v FONTL="$FONTL" ' - { printf("\n\n\n\n\n\n",FONTL,$1,FONTC,$3,FONTC,$6,FONTL,$9,FONTL,$11);} - '; - - else - - #SUCCESS - if [ "$STATUS" = "SUCCESS" ] - then - color="bgcolor=#ddffdd"; - - #ERROR - else - color="bgcolor=#ffdddd"; - fi - - FONTC=$(echo "$BODY_FONTC $color") - FONTL=$(echo "$BODY_FONTL $color") - echo $line | awk -v FONTC="$FONTC" -v FONTL="$FONTL" ' - { printf("\n\n\n\n\n\n",FONTL,$1,FONTL,$3,$4,$5,FONTC,$8,FONTL,$11,FONTL,$13);} - '; - fi - - echo "" - - done - ) -
ResultToleranceTest idTest nameField checked
%s%s%s%s%s%s%s%s%s%s%s%s
-
-END -else - mktemp content.html -fi - -#Matlab error report -if [ -e matlaberror.log ] -then - cat << END > matlaberror.html -
Matlab error
-
-
$(cat matlaberror.log)
-
-END -else - mktemp matlaberror.html -fi - -#last footer -cat << END > footer.html -
-
ISSM nightly run report
-
-END - -#concatenate files -cat summary.html content.html matlaberror.html footer.html > report.html -rm summary.html content.html footer.html matlaberror.html matlab.log