[issm-svn] r21972 - in issm/trunk: jenkins packagers/macosx packagers/macosx-dakota packagers/ubuntu

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2017-08-17 15:43:08 -0700 (Thu, 17 Aug 2017)
New Revision: 21972

Modified:
   issm/trunk/jenkins/jenkins.sh
   issm/trunk/packagers/macosx-dakota/package.sh
   issm/trunk/packagers/macosx/package.sh
   issm/trunk/packagers/ubuntu/package.sh
Log:
CHG: fixed MATLAB path

Modified: issm/trunk/jenkins/jenkins.sh
===================================================================
--- issm/trunk/jenkins/jenkins.sh	2017-08-17 22:31:10 UTC (rev 21971)
+++ issm/trunk/jenkins/jenkins.sh	2017-08-17 22:43:08 UTC (rev 21972)
@@ -31,6 +31,9 @@
 
 #source configuration script
 source $1;
+
+#For binaries, we need to know what MATLAB to use
+export MATLAB_PATH
 #}}}
 #Get Operating system (OS) name{{{
 OS=$(uname -s)

Modified: issm/trunk/packagers/macosx/package.sh
===================================================================
--- issm/trunk/packagers/macosx/package.sh	2017-08-17 22:31:10 UTC (rev 21971)
+++ issm/trunk/packagers/macosx/package.sh	2017-08-17 22:43:08 UTC (rev 21972)
@@ -10,7 +10,7 @@
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
 	echo "test101 FAILED"

Modified: issm/trunk/packagers/macosx-dakota/package.sh
===================================================================
--- issm/trunk/packagers/macosx-dakota/package.sh	2017-08-17 22:31:10 UTC (rev 21971)
+++ issm/trunk/packagers/macosx-dakota/package.sh	2017-08-17 22:43:08 UTC (rev 21972)
@@ -10,7 +10,7 @@
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-/Applications/MATLAB_R2015b.app/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
 	echo "test101 FAILED"

Modified: issm/trunk/packagers/ubuntu/package.sh
===================================================================
--- issm/trunk/packagers/ubuntu/package.sh	2017-08-17 22:31:10 UTC (rev 21971)
+++ issm/trunk/packagers/ubuntu/package.sh	2017-08-17 22:43:08 UTC (rev 21972)
@@ -8,7 +8,7 @@
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
 	echo "test101 FAILED"