Changeset 27232 for issm/trunk/packagers/linux/package-issm-linux-binaries-matlab.sh

Timestamp:

08/25/22 16:50:29 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27230

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• packagers/linux/package-issm-linux-binaries-matlab.sh (modified) (4 diffs)

issm/trunk/packagers/linux/package-issm-linux-binaries-matlab.sh

@@ -112 +112 @@
 cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
 
+echo "Moving GSHHG assets to share/"
+if [ -d ${ISSM_DIR}/externalpackages/gmt/install/share/coast ]; then
+        mkdir ${ISSM_DIR}/share 2> /dev/null
+        cp -R ${ISSM_DIR}/externalpackages/gmt/install/share/coast ${ISSM_DIR}/share
+else
+        echo "GSHHG not found"
+        exit 1
+fi
+
+echo "Moving PROJ assets to share/"
+if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
+        mkdir ${ISSM_DIR}/share 2> /dev/null
+        cp -R ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
+else
+        echo "PROJ not found"
+        exit 1
+fi
+
 # Run tests
 if [ ${skip_tests} -eq 0 ]; then
@@ -119 +137 @@
 
         # Run tests, redirecting output to logfile and suppressing output to console
-        ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
+        ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
 
         # Check that MATLAB did not exit in error
-        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log | wc -l`
+        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log`
 
         if [ ${matlabExitedInError} -ne 0 ]; then
@@ -136 +154 @@
 
         # Check that all tests passed
-        numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
+        sed -i "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
+        numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
 
         if [ ${numTestsFailed} -ne 0 ]; then
                 echo "One or more tests FAILED"
+                cat matlab.log
                 exit 1
         else
@@ -152 +172 @@
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}
+cp -rf bin examples lib scripts share test ${PKG}
 mkdir ${PKG}/execution
 echo "Cleaning up unneeded/unwanted files"