Changeset 13197

Timestamp:

08/30/12 14:39:57 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: separate matlab and python reports (tbc)

File:

• issm/trunk-jpl/scripts/report.sh (modified) (4 diffs)

issm/trunk-jpl/scripts/report.sh

@@ -7 +7 @@
 
 #process info.log
-TODAY=`     cat info.log | grep "today"           | awk '{printf("%s %s",$2,$3);}'`
-USER=`      cat info.log | grep "user"            | awk '{print $2}'`
-HOST_NAME=` cat info.log | grep "host"            | awk '{print $2}'`
-OS=`        cat info.log | grep "OS"              | awk '{print $2}'`
-RELEASE=`   cat info.log | grep "release"         | awk '{print $2}'`
-EL_INSTALL=`cat info.log | grep "elapsed_install" | awk '{print $2}'`
-EL_RUN=`    cat info.log | grep "elapsed_run"     | awk '{print $2}'`
-EL_TOTAL=`  cat info.log | grep "elapsed_total"   | awk '{print $2}'`
-CRASH=`     cat info.log | grep "matlab_crash:"   | awk '{print $2}'`
+TODAY=$(       cat info.log | grep "today"           | awk '{printf("%s %s",$2,$3);}')
+USER=$(        cat info.log | grep "user"            | awk '{print $2}')
+HOST_NAME=$(   cat info.log | grep "host"            | awk '{print $2}')
+OS=$(          cat info.log | grep "OS"              | awk '{print $2}')
+RELEASE=$(     cat info.log | grep "release"         | awk '{print $2}')
+EL_INSTALL=$(  cat info.log | grep "elapsed_install" | awk '{print $2}')
+EL_MATLAB=$(   cat info.log | grep "elapsed_matlab"  | awk '{print $2}')
+EL_PYTHON=$(   cat info.log | grep "elapsed_python"  | awk '{print $2}')
+EL_TOTAL=$(    cat info.log | grep "elapsed_total"   | awk '{print $2}')
+CRASH_MATLAB=$(cat info.log | grep "matlab_crash:"   | awk '{print $2}')
+CRASH_PYTHON=$(cat info.log | grep "python_crash:"   | awk '{print $2}')
 
 #Process matlab_log.log
@@ -21 +23 @@
 cat matlab.log        | grep -v "SUCCESS" > matlab_short.log
 cat matlab_log.log        | grep "PETSC" | sed -e "s/>/\&gt;/g" | sed -e "s/</\&lt;/g" > petscerror.log
-NUM_TOT=`wc -l matlab.log | awk '{print $1}'`
-NUM_ERR=`cat matlab.log | grep 'ERROR'   | grep -v "PETSC" | wc -l`
-NUM_SUC=`cat matlab.log | grep 'SUCCESS' | wc -l`
-NUM_FAI=`cat matlab.log | grep 'FAILURE' | wc -l`
+NUM_TOT=$(wc -l matlab.log | awk '{print $1}')
+NUM_ERR=$(cat matlab.log | grep 'ERROR'   | grep -v "PETSC" | wc -l)
+NUM_SUC=$(cat matlab.log | grep 'SUCCESS' | wc -l)
+NUM_FAI=$(cat matlab.log | grep 'FAILURE' | wc -l)
 
 #style
@@ -99 +101 @@
 <tr>
 <td $TABLE_FONT>number of <a href="#FAILURE">failures</a>: $NUM_FAI/$NUM_TOT
-<td $TABLE_FONT>execution elapsed time: $EL_RUN</td>
+<td $TABLE_FONT>execution elapsed time: $EL_MATLAB</td>
 </tr>
 </table>
@@ -108 +110 @@
 if [ $IS_INSTALL -eq 1 ];
 then
-        if [ $CRASH -eq 0 ];
+        if [ $CRASH_MATLAB -eq 0 ];
         then
                 cat summary.html | sed -e "s/STATUS/<span style=\"color:#008000\">all test desks have been run<\/span>/g" > summary2.html