Changeset 26782

Timestamp:

01/14/22 10:16:05 (3 years ago)

Author:

jdquinn

Message:

BUG: Redirection fixed on Windows using tee

File:

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

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

@@ -347 +347 @@
 
                 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" -logfile ${ISSM_WIN_DIR}/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" | tee ${ISSM_DIR_WIN}/nightlylog/matlab_log$i.log &
                 else
-                        $MATLAB_PATH/bin/matlab -nodisplay -nosplash -nojvm -r "addpath ${ISSM_DIR}/src/m/dev; devpath; addpath ${ISSM_DIR}/nightlylog; matlab_run$i" &> ${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" | tee ${ISSM_DIR}/nightlylog/matlab_log$i.log &
                 fi
         done
@@ -378 +378 @@
                 echo "pid: ${pid}"
                 echo '-----------------------------'
+
                 # Time out after $max_time seconds because sometimes multiple MATLAB processes get locked in race condition
                 timer=0
@@ -383 +384 @@
                 while [[ $timer -lt $max_time && -n "${pid}" ]]; do
                         pid=$(ps -W | grep MATLAB | awk '{print $1}')
-                        timer=$((timer + 1))
                         sleep 1;
                 done
+
                 # Check if timer hit $max_time
                 if [ $timer -eq $max_time ]; then
@@ -391 +392 @@
                         # Kill MATLAB processes
                         pid=$(ps -W | grep MATLAB | awk '{print $1}')
-                        /bin/kill -f "${pid}"
+                        echo "${pid}" | xargs /bin/kill -f
                         exit 1
                 fi