Changeset 27712


Ignore:
Timestamp:
04/27/23 11:47:44 (23 months ago)
Author:
jdquinn
Message:

CHG: Correcting Silicon environment to allow for MATLAB tests; generalizing catch for some MATLAB errors

Location:
issm/trunk-jpl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/jenkins.sh

    r27708 r27712  
    477477
    478478        # Check that MATLAB did not exit in error
    479         matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab_log.log | wc -l`
     479        matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab_log.log | wc -l`
    480480
    481481        if [ $matlabExitedInError -ne 0 ]; then
    … …  
    530530
    531531        # Check that MATLAB did not exit in error
    532         matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal use of reserved keyword" matlab_log_examples.log | wc -l`
     532        matlabExitedInError=`grep -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab_log_examples.log | wc -l`
    533533
    534534        if [ $matlabExitedInError -ne 0 ]; then

  • issm/trunk-jpl/jenkins/mac-silicon-basic

    r27702 r27712  
    1414# ISSM Configuration #
    1515#--------------------#
     16
     17MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configu
     18re/compile MATLAB wrappers, we need to set this variable for testing
    1619
    1720ISSM_CONFIG='\

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

    r27603 r27712  
    140140
    141141        # Check that MATLAB did not exit in error
    142         matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     142        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
    143143
    144144        if [ ${matlabExitedInError} -ne 0 ]; then

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

    r27607 r27712  
    147147
    148148        # Check that MATLAB did not exit in error
    149         matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     149        matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
    150150
    151151        if [ ${matlabExitedInError} -ne 0 ]; then

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

    r27603 r27712  
    3434# Check that MATLAB did not exit in error
    3535matlabExitCode=`echo $?`
    36 matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal use of reserved keyword|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
     36matlabExitedInError=`grep -c -E "Activation cannot proceed|Error in|Illegal|Invalid MEX-file|license|Warning: Name is nonexistent or not a directory" matlab.log`
    3737
    3838if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
Note: See TracChangeset for help on using the changeset viewer.