Changeset 18640

Timestamp:

10/14/14 14:37:03 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing wait command

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -192 +192 @@
 EOF
         cd $ISSM_DIR/test/NightlyRun
-        if [ "$OS" = "win7" ]; then
-                echo "HERE I AM"
-                matlab -nojvm -nosplash -r "exit;"
-                $MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log
-        else
-                $MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
-        fi
+        $MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
 done
 
 #wait until matlab closes
-if [ "$OS" != "win7" ]; then
+if [ "$OS" = "win7" ]; then
+        echo "Waiting for matlab on windows"
+        pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')
+        while [ -n "$pid" ]
+        do
+                pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')
+                sleep 1;
+        done
+        echo "DONE!"
+else
         wait
 fi