Changeset 26785

Timestamp:

01/14/22 12:46:01 (3 years ago)

Author:

jdquinn

Message:

BUG: Added clarification about need to handle Windows MATLAB processes differently than *nix

File:

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

issm/trunk-jpl/jenkins/jenkins.sh ¶

@@ -346 +346 @@
                 cd $ISSM_DIR/test/NightlyRun
 
+                # NOTE: We redirect all output to logfile in order to catch certain errors. For some reason, this does not work under Windows: the logifle option must be used and process must be run in background
                 if [[ "${OS}" == CYGWIN* || ${MINGW} -eq 1 ]]; then
-                        $MATLAB_PATH/bin/matlab -nodesktop -nosplash -nojvm -r "addpath ${ISSM_DIR_WIN}/src/m/dev; devpath; addpath ${ISSM_DIR_WIN}/nightlylog; matlab_run$i" | tee ${ISSM_DIR_WIN}/nightlylog/matlab_log$i.log &
+                        $MATLAB_PATH/bin/matlab -nodesktop -nosplash -nojvm -r "addpath ${ISSM_DIR_WIN}/src/m/dev; devpath; addpath ${ISSM_DIR_WIN}/nightlylog; matlab_run$i" -logfile ${ISSM_DIR_WIN}/nightlylog/matlab_log$i.log &
                 else
-                        $MATLAB_PATH/bin/matlab -nodisplay -nosplash -r "addpath ${ISSM_DIR}/src/m/dev; devpath; addpath ${ISSM_DIR}/nightlylog; matlab_run$i" | tee ${ISSM_DIR}/nightlylog/matlab_log$i.log &
+                        $MATLAB_PATH/bin/matlab -nodisplay -nosplash -r "addpath ${ISSM_DIR}/src/m/dev; devpath; addpath ${ISSM_DIR}/nightlylog; matlab_run$i" &> ${ISSM_DIR}/nightlylog/matlab_log$i.log &
                 fi
         done
@@ -384 +385 @@
                 while [[ $timer -lt $max_time && -n "${pid}" ]]; do
                         pid=$(ps -W | grep MATLAB | awk '{print $1}')
+                        timer=$((timer + 1))
                         sleep 1;
                 done