source: issm/oecreview/Archive/27032-27229/ISSM-27147-27148.diff

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

CHG: oecreview
File size: 12.8 KB

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

     
    144144        ${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
    145145
    146146        # Check that MATLAB did not exit in error
    147         matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log | wc -l`
     147        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab.log`
    148148
    149149        if [ ${matlabExitedInError} -ne 0 ]; then
    150150                echo "----------MATLAB exited in error!----------"
    … …  
    158158        fi
    159159
    160160        # Check that all tests passed
    161         numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
     161        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
     162        numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
    162163
    163164        if [ ${numTestsFailed} -ne 0 ]; then
    164165                echo "One or more tests FAILED"
     166                cat matlab.log
    165167                exit 1
    166168        else
    167169                echo "All tests PASSED"
    … …  
    174176cd ${ISSM_DIR}
    175177svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    176178echo "Copying assets to package: ${PKG}"
    177 cp -rf bin examples lib scripts test ${PKG}
     179cp -rf bin examples lib scripts share test ${PKG}
    178180mkdir ${PKG}/execution
    179181cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
    180182echo "Cleaning up unneeded/unwanted files"

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

     
    142142
    143143        # Check that Python did not exit in error
    144144        pythonExitCode=`echo $?`
    145         pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
     145        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
    146146
    147147        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    148148                echo "----------Python exited in error!----------"
    … …  
    156156        fi
    157157
    158158        # Check that all tests passed
    159         numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
     159        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     160        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    160161
    161162        if [ ${numTestsFailed} -ne 0 ]; then
    162163                echo "One or more tests FAILED"
     164                cat python.log
    163165                exit 1
    164166        else
    165167                echo "All tests PASSED"
    … …  
    172174cd ${ISSM_DIR}
    173175svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    174176echo "Copying assets to package: ${PKG}"
    175 cp -rf bin examples lib scripts test ${PKG}
     177cp -rf bin examples lib scripts share test ${PKG}
    176178mkdir ${PKG}/execution
    177179cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
    178180${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files

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

     
    145145
    146146        # Check that Python did not exit in error
    147147        pythonExitCode=`echo $?`
    148         pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
     148        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
    149149
    150150        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    151151                echo "----------Python exited in error!----------"
    … …  
    159159        fi
    160160
    161161        # Check that all tests passed
    162         numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
     162        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     163        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    163164
    164165        if [ ${numTestsFailed} -ne 0 ]; then
    165166                echo "One or more tests FAILED"
     167                cat python.log
    166168                exit 1
    167169        else
    168170                echo "All tests PASSED"
    … …  
    175177cd ${ISSM_DIR}
    176178svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    177179echo "Copying assets to package: ${PKG}"
    178 cp -rf bin examples lib scripts test ${PKG}
     180cp -rf bin examples lib scripts share test ${PKG}
    179181mkdir ${PKG}/execution
    180182cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
    181183${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files

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

     
    3333
    3434# Check that MATLAB did not exit in error
    3535matlabExitCode=`echo $?`
    36 matlabExitedInError=`grep -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log | wc -l`
     36matlabExitedInError=`grep -c -E "Activation cannot proceed|license|Error|Warning: Name is nonexistent or not a directory" matlab.log`
    3737
    3838if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
    3939        echo "----------MATLAB exited in error!----------"
    … …  
    4444fi
    4545
    4646# Check that all tests passed
    47 numTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
     47numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
    4848
    4949if [[ ${numTestsFailed} -ne 0 ]]; then
    5050        echo "One or more tests FAILED"

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

     
    3333
    3434# Check that Python did not exit in error
    3535pythonExitCode=`echo $?`
    36 pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
     36pythonExitedInError=`grep -c -E "runme.py: error" python.log`
    3737
    3838if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    3939        echo "----------Python exited in error!----------"
    … …  
    4343fi
    4444
    4545# Check that all tests passed
    46 numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     46numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    4747
    4848if [[ ${numTestsFailed} -ne 0 ]]; then
    4949        echo "One or more tests FAILED"

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

     
    3333
    3434# Check that Python did not exit in error
    3535pythonExitCode=`echo $?`
    36 pythonExitedInError=`grep -E "runme.py: error" python.log | wc -l`
     36pythonExitedInError=`grep -c -E "runme.py: error" python.log`
    3737
    3838if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    3939        echo "----------Python exited in error!----------"
    … …  
    4343fi
    4444
    4545# Check that all tests passed
    46 numTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     46numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    4747
    4848if [[ ${numTestsFailed} -ne 0 ]]; then
    4949        echo "One or more tests FAILED"

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

     
    130130        ${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
    131131
    132132        # Check that MATLAB did not exit in error
    133         matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log | wc -l`
     133        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword|Invalid MEX-file" matlab.log`
    134134
    135135        if [ ${matlabExitedInError} -ne 0 ]; then
    136136                echo "----------MATLAB exited in error!----------"
    … …  
    144144        fi
    145145
    146146        # Check that all tests passed
    147         numTestsFailed=`grep -E "FAILED|ERROR" matlab.log | wc -l`
     147        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
     148        numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
    148149
    149150        if [ ${numTestsFailed} -ne 0 ]; then
    150151                echo "One or more tests FAILED"
    … …  
    161162cd ${ISSM_DIR}
    162163svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    163164echo "Copying assets to package: ${PKG}"
    164 cp -rf bin examples lib scripts test ${PKG}
     165cp -rf bin examples lib scripts share test ${PKG}
    165166mkdir ${PKG}/execution
    166167echo "Cleaning up unneeded/unwanted files"
    167168rm -f ${PKG}/bin/generic_static.* # Remove static versions of generic cluster classes

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

     
    129129
    130130        # Check that Python did not exit in error
    131131        pythonExitCode=`echo $?`
    132         pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
     132        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
    133133
    134134        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    135135                echo "----------Python exited in error!----------"
    … …  
    143143        fi
    144144
    145145        # Check that all tests passed
    146         numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
     146        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     147        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    147148
    148149        if [[ ${numTestsFailed} -ne 0 ]]; then
    149                         echo "One or more tests FAILED"
    150                         cat python.log
     150                echo "One or more tests FAILED"
     151                cat python.log
    151152                exit 1
    152153        else
    153154                echo "All tests PASSED"
    … …  
    160161cd ${ISSM_DIR}
    161162svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    162163echo "Copying assets to package: ${PKG}"
    163 cp -rf bin examples lib scripts test ${PKG}
     164cp -rf bin examples lib scripts share test ${PKG}
    164165mkdir ${PKG}/execution
    165166${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
    166167echo "Cleaning up unneeded/unwanted files"

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

     
    132132
    133133        # Check that Python did not exit in error
    134134        pythonExitCode=`echo $?`
    135         pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
     135        pythonExitedInError=`grep -c -E "Error|Standard exception|Traceback|bad interpreter" python.log`
    136136
    137137        if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    138138                echo "----------Python exited in error!----------"
    … …  
    146146        fi
    147147
    148148        # Check that all tests passed
    149         numTestsFailed=`grep -E "FAILED|ERROR" python.log | wc -l`
     149        sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     150        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    150151
    151152        if [[ ${numTestsFailed} -ne 0 ]]; then
    152153                echo "One or more tests FAILED"
    … …  
    163164cd ${ISSM_DIR}
    164165svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    165166echo "Copying assets to package: ${PKG}"
    166 cp -rf bin examples lib scripts test ${PKG}
     167cp -rf bin examples lib scripts share test ${PKG}
    167168mkdir ${PKG}/execution
    168169${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
    169170echo "Cleaning up unneeded/unwanted files"
Note: See TracBrowser for help on using the repository browser.