Changeset 25964

Timestamp:

02/01/21 15:21:01 (4 years ago)

Author:

jdquinn

Message:

CHG: Trying to bring jUnit reports back online for examples

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -485 +485 @@
                 exit 1
         fi
-
-        # Python tests must have run and exited successfully (unless we have missed something)
-        echo "PYTHONEXITEDCORRECTLY"
 fi
 
@@ -501 +498 @@
                 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