Changeset 27064


Ignore:
Timestamp:
06/15/22 12:54:43 (3 years ago)
Author:
jdquinn
Message:

BUG: Was not catching certain errors during testing of binaries; needed to explicitly link to libbacktrace on newer versions of GCC on Linux

Location:
issm/trunk-jpl
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r26762 r27064  
    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
    … …  
    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

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

    r26988 r27064  
    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

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

    r26992 r27064  
    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

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

    r26765 r27064  
    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

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

    r27002 r27064  
    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

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

    r27013 r27064  
    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

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

    r26415 r27064  
    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

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

    r26377 r27064  
    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
Note: See TracChangeset for help on using the changeset viewer.