Changeset 22757 for issm/trunk-jpl/jenkins/jenkins.sh

Timestamp:

05/10/18 10:20:20 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• jenkins/jenkins.sh (modified) (2 diffs)

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

@@ -296 +296 @@
         cd $ISSM_DIR/test/NightlyRun
         if [ "$OS" = "win" ]; then
-                $MATLAB_PATH/bin/matlab -nojvm -nosplash -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 -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 &
+                $MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -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 -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
         fi
 done
@@ -470 +470 @@
                                 echo 'end' >> $FILE
 
-                                $MATLAB_PATH/bin/matlab -nosplash -nodisplay -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
+                                $MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; runme" -logfile $ISSM_DIR/nightlylog/$LOG_FILE
                                 echo "starting: $(basename $dir)" >> $ISSM_DIR/nightlylog/matlab_log_examples.log
                                 cat $ISSM_DIR/nightlylog/$LOG_FILE >> $ISSM_DIR/nightlylog/matlab_log_examples.log