Changeset 26817

Timestamp:

01/25/22 12:30:43 (3 years ago)

Author:

jdquinn

Message:

BUG: Reverting position of error log checks so that test failures are parsed correctly

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (5 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -419 +419 @@
         #filter out windows characters:
         cat matlab_log.log | tr -cd '\11\12\40-\176' > matlab_log.log2 && mv matlab_log.log2 matlab_log.log
-
-        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log.log  | wc -l`
-
-        if [[ ${matlabExitedInError} -ne 0 ]]; then
-                echo "----------MATLAB exited in error!----------"
-                cat matlab_log.log 
-                echo "-----------End of matlab.log-----------"
-
-                # Clean up execution directory
-                rm -rf ${ISSM_DIR}/execution/*
-
-                exit 1
-        fi
 fi
 # }}}
@@ -469 +456 @@
                 cat python_log$i.log >> python_log.log
         done
-
-        # Check that Python did not exit in error
-        pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python_log.log | wc -l`
-
-        if [ $pythonExitedInError -ne 0 ]; then
-                echo "----------Python exited in error!----------"
-                cat python_log.log
-                echo "-----------End of python_log.log-----------"
-
-                # Clean up execution directory
-                rm -rf $ISSM_DIR/execution/*
-
-                exit 1
-        fi
 fi
 # }}}
@@ -513 +486 @@
                 juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" matlab_log.log
         done
+
+        # Check that MATLAB did not exit in error
+        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log.log | wc -l`
+
+        if [ $matlabExitedInError -ne 0 ]; then
+                echo "----------MATLAB exited in error!----------"
+                cat matlab_log.log
+                echo "-----------End of matlab_log.log-----------"
+
+                # Clean up execution directory
+                rm -rf $ISSM_DIR/execution/*
+
+                exit 1
+        fi
 fi
 
@@ -525 +512 @@
                 juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" python_log.log
         done
+
+        # Check that Python did not exit in error
+        pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python_log.log | wc -l`
+
+        if [ $pythonExitedInError -ne 0 ]; then
+                echo "----------Python exited in error!----------"
+                cat python_log.log
+                echo "-----------End of python_log.log-----------"
+
+                # Clean up execution directory
+                rm -rf $ISSM_DIR/execution/*
+
+                exit 1
+        fi
 fi
 
@@ -538 +539 @@
                 juLog -test=Example-$i -name=Failure -error=FAILURE awk "/^starting: ${i}$/{flag=1;next}/^finished: ${i}$/{flag=0} flag{print}" matlab_log_examples.log
         done
+
+        # Check that MATLAB did not exit in error
+        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log_examples.log | wc -l`
+
+        if [ $matlabExitedInError -ne 0 ]; then
+                echo "----------MATLAB exited in error!----------"
+                cat matlab_log_examples.log
+                echo "-----------End of matlab_log.log-----------"
+
+                # Clean up execution directory
+                rm -rf $ISSM_DIR/execution/*
+
+                exit 1
+        fi
 fi