Changeset 21089

Timestamp:

08/04/16 15:12:21 (9 years ago)

Author:

glperez

Message:

CHG: Adding testing for examples.

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -315 +315 @@
 
 # This test will allow us to check on the status of the examples.
-if [ $EXAMPLES_TEST -eq 1 ]; then
+if [ $EXAMPLES_TEST -eq 1 ];
+then
         FILE='runme.m'
         cd $ISSM_DIR/examples
@@ -332 +333 @@
                                 SED='sed'
                         fi
-                        STEP_EIGHT="\n  disp('   Step 8: Plotting exercise');\n md = loadmodel('.\/Models\/Greenland.HistoricTransient_200yr');\n       figure\n        surfmb=[]; for i=2:201; surfmb=[surfmb ...\n            md.results.TransientSolution(i).SmbMassBalance]; end\n  subplot(3,1,1); plot([1:200],mean(surfmb));\n   title('Mean Surface mass balance');\n   vel=[]; for i=2:201; vel=[vel md.results.TransientSolution(i).Vel]; end\n       subplot(3,1,2); plot([1:200],mean(vel));\n      title('Mean Velocity');\n       volume=[]; for i=2:201; volume=[volume md.results.TransientSolution(i).IceVolume]; end\n        subplot(3,1,3); plot([1:200],volume);\n title('Ice Volume'); xlabel('years');"
 
                         cd ${dir}
@@ -338 +338 @@
                         if [ "${dir}" == "./Greenland" ];
                         then
+                                STEP_EIGHT="\n  disp('   Step 8: Plotting exercise');\n md = loadmodel('.\/Models\/Greenland.HistoricTransient_200yr');\n       figure\n        surfmb=[]; for i=2:201; surfmb=[surfmb ...\n            md.results.TransientSolution(i).SmbMassBalance]; end\n  subplot(3,1,1); plot([1:200],mean(surfmb));\n   title('Mean Surface mass balance');\n   vel=[]; for i=2:201; vel=[vel md.results.TransientSolution(i).Vel]; end\n       subplot(3,1,2); plot([1:200],mean(vel));\n      title('Mean Velocity');\n       volume=[]; for i=2:201; volume=[volume md.results.TransientSolution(i).IceVolume]; end\n        subplot(3,1,3); plot([1:200],volume);\n title('Ice Volume'); xlabel('years');"
+
+                                $SED -i.bak 's/steps=\[1\];/steps=\[1:8\];\n\ntry\n/' $FILE
                                 $SED -i.bak "s/if any(steps==8)/&${STEP_EIGHT}/" $FILE
-                                $SED -i.bak 's/steps=\[1\];/steps=\[1:8\];/' $FILE
                         else
                                 echo "Not implemented yet!"
@@ -347 +349 @@
                                 ./Download.sh
                         else
+                                echo 'disp("SUCCESS")' >> $FILE
+                                echo 'catch' >> $FILE
+                                echo "\tdisp("FAILURE");" >> $FILE
+                                echo 'end' >> $FILE
+                                echo "starting: ${dir}"
+
                                 $MATLAB_PATH/bin/matlab -nosplash -nodisplay -r "addpath $ISSM_DIR/src/m/dev; devpath; runme" -logfile $ISSM_DIR/nightlylog/matlab_log_examples.log
                         fi
@@ -384 +392 @@
         done
 fi
-#}}}
+if [ $EXAMPLES_TEST -eq 1 ];
+        numtests=`cat python_log.log  | grep "starting: " | wc -l`
+        for i in `echo $numtests`
+        do
+                juLog  -test=Example-$i -name=Error -error=FAILURE cat matlab_log_examples.log
+        done
+then
+fi
+#}}}