Changeset 25173

Timestamp:

06/29/20 10:07:14 (5 years ago)

Author:

jdquinn

Message:

CHG: Changes to test suites.

Location:

issm/trunk-jpl

Files:

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

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

@@ -75 +75 @@
 #
 # NOTE:
-# - test418.m is now excluded as partitioner class needs to be refactored
-# - See test418.py for reason why it is excluded for now (should be fixed)
+# - Errors are large for tests 234 and 420 under Python
 #
-MATLAB_NROPTIONS="'exclude',[234,243,418,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'"
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')]"
+PYTHON_NROPTIONS="--exclude 234 420 --include_name 'Dakota'"

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

@@ -6 +6 @@
 LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
 LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,243,418,420,435,444,445,701,702,703]" # Exclude any tests with transient solutions that require a restart
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')]" # Exclude any tests with transient solutions that require a restart
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
 PACKAGE="ISSM" # Name of directory to copy distributable files to
@@ -16 +16 @@
 # - 418 fails with "malloc(): invalid next size (unsorted)""
 #
-PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 243 418 420 435 444 445 701 702 703"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 420"
 TARBALL_NAME="issm-linux-with_dakota"
 TARBALL="${TARBALL_NAME}.tar.gz"

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh

@@ -4 +4 @@
 ## Constants
 #
-MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,243,418,420,435,444,445,701,702,703]" # Exclude any tests with transient solutions that require a restart, and any tests that are excluded in the standard build
+MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,418,420]" # Exclude any tests with transient solutions that require a restart, and any tests that are excluded in the standard build
 MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 PACKAGE="ISSM" # Name of directory to copy distributable files to
@@ -13 +13 @@
 # - 418 fails with "malloc(): invalid next size (unsorted)""
 #
-PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 243 418 420 435 444 445 701 702 703"
+PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420"
 TARBALL_NAME="issm-mac-with_dakota"
 TARBALL="${TARBALL_NAME}.tar.gz"