source: issm/oecreview/Archive/27032-27229/ISSM-27063-27064.diff

Last change on this file was 27230, checked in by Mathieu Morlighem, 3 years ago

CHG: oecreview
File size: 5.0 KB

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

     
    121121        ${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
    122122
    123123        # Check that MATLAB did not exit in error
    124         matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log | wc -l`
     124        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l`
    125125
    126126        if [ ${matlabExitedInError} -ne 0 ]; then
    127127                echo "----------MATLAB exited in error!----------"
    … …  
    135135        fi
    136136
    137137        # Check that all tests passed
    138         numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
     138        numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
    139139
    140140        if [ ${numTestsFailed} -ne 0 ]; then
    141141                echo "One or more tests FAILED"

  • ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh

     
    135135        fi
    136136
    137137        # Check that all tests passed
    138         numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     138        numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
    139139
    140140        if [[ ${numTestsFailed} -ne 0 ]]; then
    141141                echo "One or more tests FAILED"

  • ../trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

     
    138138        fi
    139139
    140140        # Check that all tests passed
    141         numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     141        numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
    142142
    143143        if [[ ${numTestsFailed} -ne 0 ]]; then
    144144                echo "One or more tests FAILED"

  • ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

     
    149149        fi
    150150
    151151        # Check that all tests passed
    152         numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
     152        numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
    153153
    154154        if [ ${numTestsFailed} -ne 0 ]; then
    155155                echo "One or more tests FAILED"

  • ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh

     
    147147        fi
    148148
    149149        # Check that all tests passed
    150         numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     150        numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
    151151
    152152        if [ ${numTestsFailed} -ne 0 ]; then
    153153                echo "One or more tests FAILED"

  • ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

     
    150150        fi
    151151
    152152        # Check that all tests passed
    153         numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     153        numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
    154154
    155155        if [ ${numTestsFailed} -ne 0 ]; then
    156156                echo "One or more tests FAILED"

  • ../trunk-jpl/src/wrappers/matlab/Makefile.am

     
    121121if MAC
    122122AM_LDFLAGS += -Wl,-rpath,'@rpath'
    123123else
    124 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     124AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
    125125endif
    126126endif
    127127

  • ../trunk-jpl/src/wrappers/python/Makefile.am

     
    7575if MAC
    7676AM_LDFLAGS += -Wl,-rpath,'@rpath'
    7777else
    78 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
     78AM_LDFLAGS += -Wl,-static -Wl,-lbacktrace -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
    7979endif
    8080endif
    8181
Note: See TracBrowser for help on using the repository browser.