Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh =================================================================== --- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27063) +++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27064) @@ -121,7 +121,7 @@ ${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 # 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 -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l` if [ ${matlabExitedInError} -ne 0 ]; then echo "----------MATLAB exited in error!----------" @@ -135,7 +135,7 @@ fi # Check that all tests passed - numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l` if [ ${numTestsFailed} -ne 0 ]; then echo "One or more tests FAILED" Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh =================================================================== --- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27063) +++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27064) @@ -135,7 +135,7 @@ fi # Check that all tests passed - numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l` if [[ ${numTestsFailed} -ne 0 ]]; then echo "One or more tests FAILED" Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh =================================================================== --- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27063) +++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27064) @@ -138,7 +138,7 @@ fi # Check that all tests passed - numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l` if [[ ${numTestsFailed} -ne 0 ]]; then echo "One or more tests FAILED" Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh =================================================================== --- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27063) +++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 27064) @@ -149,7 +149,7 @@ fi # Check that all tests passed - numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l` if [ ${numTestsFailed} -ne 0 ]; then echo "One or more tests FAILED" Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh =================================================================== --- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27063) +++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh (revision 27064) @@ -147,7 +147,7 @@ fi # Check that all tests passed - numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l` if [ ${numTestsFailed} -ne 0 ]; then echo "One or more tests FAILED" Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh =================================================================== --- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27063) +++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh (revision 27064) @@ -150,7 +150,7 @@ fi # Check that all tests passed - numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"` + numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l` if [ ${numTestsFailed} -ne 0 ]; then echo "One or more tests FAILED" Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 27063) +++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 27064) @@ -121,7 +121,7 @@ if MAC AM_LDFLAGS += -Wl,-rpath,'@rpath' else -AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN' +AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN' endif endif Index: ../trunk-jpl/src/wrappers/python/Makefile.am =================================================================== --- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 27063) +++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 27064) @@ -75,7 +75,7 @@ if MAC AM_LDFLAGS += -Wl,-rpath,'@rpath' else -AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN' +AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN' endif endif