Changeset 24828

Timestamp:

05/08/20 20:22:30 (5 years ago)

Author:

jdquinn

Message:

CHG: Updated test suites

Location:

issm/trunk-jpl

Files:

• jenkins/pine_island-mac-dakota (modified) (1 diff)
• jenkins/ross-debian_linux-dakota (modified) (1 diff)
• scripts/test-issm-linux-binaries-with_dakota.sh (modified) (2 diffs)
• scripts/test-issm-mac-binaries-with_dakota.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/pine_island-mac-dakota

@@ -77 +77 @@
 #
 # NOTE:
-# - See test418.py for reason why it is excluded for now
-# - Error is large for test420
+# - Errors are large for tests 235, 418, and 420 on Mac
+# - See test418.py for reason why it is excluded for now (should be fixed)
 # - test701 is skipped because it uses full Stokes equations
 #
-MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703],'id',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS="--exclude 234 243 418 420 435 444 445 701 702 703 --include_name 'Dakota'"
+MATLAB_NROPTIONS="'exclude',[234,235,243,418,420,435,444,445,701,702,703],'id',[IdFromString('Dakota')]"
+PYTHON_NROPTIONS="--exclude 234 235 243 418 420 435 444 445 701 702 703 --include_name 'Dakota'"

issm/trunk-jpl/jenkins/ross-debian_linux-dakota

@@ -75 +75 @@
 #
 # NOTE:
-# - See test418.py for reason why it is excluded for now.
+# - See test418.py for reason why it is excluded for now (should be fixed)
 #
-MATLAB_NROPTIONS="'exclude',[234,243,420,435,444,445,701,702,703,],'id',[IdFromString('Dakota')]"
+MATLAB_NROPTIONS="'exclude',[234,243,420,444,445,701,702,703],'id',[IdFromString('Dakota')]"
 PYTHON_NROPTIONS="--exclude 234 243 418 420 435 444 445 701 702 703 --include_name 'Dakota'"

issm/trunk-jpl/scripts/test-issm-linux-binaries-with_dakota.sh

@@ -6 +6 @@
 #
 
-MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,244,250,417,444,445]"  # Exclude any tests with transient solutions that require a restart
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,243,244,250,417,420,444,445,701,702,703]"  # Exclude any tests with transient solutions that require a restart
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
 INSTALL_DIR=~/Downloads
@@ -14 +14 @@
 #
 # NOTE:
-# - All non-excluded tests were running until recent changes to QMU
 # - 418 fails with "malloc(): invalid next size (unsorted)""
 #
-PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 244 250 417 418 444 445"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 235 243 244 250 417 418 420 444 445 701 702 703"
 TARBALL_NAME="issm-linux-with_dakota"
 TARBALL="${TARBALL_NAME}.tar.gz"

issm/trunk-jpl/scripts/test-issm-mac-binaries-with_dakota.sh

@@ -6 +6 @@
 #
 
-MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,244,250,417,444,445]"  # Exclude any tests with transient solutions that require a restart
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,243,244,250,417,418,420,435,444,445,701,702,703]" # Regular test suite, plus any tests with transient solutions that require a restart
 MATLAB_PATH="/Applications/MATLAB_R2019b.app"
 INSTALL_DIR=~/Downloads
@@ -14 +14 @@
 #
 # NOTE:
-# - All non-excluded tests were running until recent changes to QMU
 # - 418 fails with "malloc(): invalid next size (unsorted)""
 #
-PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 244 250 417 418 444 445"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 235 243 244 250 417 418 420 435 444 445 701 702 703"
 TARBALL_NAME="issm-mac-with_dakota"
 TARBALL="${TARBALL_NAME}.tar.gz"