summaryrefslogtreecommitdiffstats
path: root/bin/batch
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-02-11 18:05:24 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-02-11 18:05:24 (GMT)
commite2b6e72e7c153bdbc9bf5f0e0c300d4ffea1cb69 (patch)
treeecea40bae538dcb7b51e431c37593a88598474c1 /bin/batch
parenta3a90e79afda2351f16181ec3592b96caceffbe1 (diff)
parentedcbc9966f5c742970ad32eb50a7925fcf7ab677 (diff)
downloadhdf5-e2b6e72e7c153bdbc9bf5f0e0c300d4ffea1cb69.zip
hdf5-e2b6e72e7c153bdbc9bf5f0e0c300d4ffea1cb69.tar.gz
hdf5-e2b6e72e7c153bdbc9bf5f0e0c300d4ffea1cb69.tar.bz2
Merge pull request #1530 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'edcbc9966f5c742970ad32eb50a7925fcf7ab677': Refactor parallel test names Rename parallel tests to start with PAR_ Distinguish parallel performance tests Set the full generator name Add new cmake copy file tests to ignore Use correct values for other file versions CMake script changes to simplify execution
Diffstat (limited to 'bin/batch')
-rw-r--r--bin/batch/cori_ctestP.sl.in.cmake2
-rw-r--r--bin/batch/cori_ctestS.sl.in.cmake2
-rw-r--r--bin/batch/cori_knl_ctestP.sl.in.cmake2
-rw-r--r--bin/batch/cori_knl_ctestS.sl.in.cmake2
-rw-r--r--bin/batch/ctestP.sl.in.cmake2
-rw-r--r--bin/batch/ctestS.sl.in.cmake2
-rw-r--r--bin/batch/knl_ctestP.sl.in.cmake2
-rw-r--r--bin/batch/knl_ctestS.sl.in.cmake2
-rw-r--r--bin/batch/ray_ctestP.lsf.in.cmake2
-rw-r--r--bin/batch/ray_ctestS.lsf.in.cmake2
10 files changed, 10 insertions, 10 deletions
diff --git a/bin/batch/cori_ctestP.sl.in.cmake b/bin/batch/cori_ctestP.sl.in.cmake
index 6aa4916..af43410 100644
--- a/bin/batch/cori_ctestP.sl.in.cmake
+++ b/bin/batch/cori_ctestP.sl.in.cmake
@@ -9,7 +9,7 @@
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+CMD="ctest . -R PAR_ -E t_cache_image -C Release -T test"
echo "Run $CMD. Test output will be in build/ctestP.out"
$CMD >& ctestP.out
diff --git a/bin/batch/cori_ctestS.sl.in.cmake b/bin/batch/cori_ctestS.sl.in.cmake
index cf68826..be9267a 100644
--- a/bin/batch/cori_ctestS.sl.in.cmake
+++ b/bin/batch/cori_ctestS.sl.in.cmake
@@ -9,7 +9,7 @@
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+CMD="ctest . -E PAR_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
diff --git a/bin/batch/cori_knl_ctestP.sl.in.cmake b/bin/batch/cori_knl_ctestP.sl.in.cmake
index 90dd52a..38fa81d 100644
--- a/bin/batch/cori_knl_ctestP.sl.in.cmake
+++ b/bin/batch/cori_knl_ctestP.sl.in.cmake
@@ -9,7 +9,7 @@
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+CMD="ctest . -R PAR_ -E t_cache_image -C Release -T test"
echo "Run $CMD. Test output will be in build/ctestP.out"
$CMD >& ctestP.out
diff --git a/bin/batch/cori_knl_ctestS.sl.in.cmake b/bin/batch/cori_knl_ctestS.sl.in.cmake
index 7db4483..5474672 100644
--- a/bin/batch/cori_knl_ctestS.sl.in.cmake
+++ b/bin/batch/cori_knl_ctestS.sl.in.cmake
@@ -9,7 +9,7 @@
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+CMD="ctest . -E PAR_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
diff --git a/bin/batch/ctestP.sl.in.cmake b/bin/batch/ctestP.sl.in.cmake
index 9fed14d..eadf336 100644
--- a/bin/batch/ctestP.sl.in.cmake
+++ b/bin/batch/ctestP.sl.in.cmake
@@ -8,7 +8,7 @@
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+CMD="ctest . -R PAR_ -E t_cache_image -C Release -T test"
echo "Run $CMD. Test output will be in build/ctestP.out"
$CMD >& ctestP.out
diff --git a/bin/batch/ctestS.sl.in.cmake b/bin/batch/ctestS.sl.in.cmake
index 98c1bcd..6f97d2b 100644
--- a/bin/batch/ctestS.sl.in.cmake
+++ b/bin/batch/ctestS.sl.in.cmake
@@ -8,7 +8,7 @@
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+CMD="ctest . -E PAR_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
diff --git a/bin/batch/knl_ctestP.sl.in.cmake b/bin/batch/knl_ctestP.sl.in.cmake
index 5c7c83f..3e5cbe5 100644
--- a/bin/batch/knl_ctestP.sl.in.cmake
+++ b/bin/batch/knl_ctestP.sl.in.cmake
@@ -10,7 +10,7 @@
cd @HDF5_BINARY_DIR@
#run parallel tests except t_cache_image test
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+CMD="ctest . -R PAR_ -E t_cache_image -C Release -T test"
echo "Run $CMD. Test output will be in build/ctestP.out"
$CMD >& ctestP.out
diff --git a/bin/batch/knl_ctestS.sl.in.cmake b/bin/batch/knl_ctestS.sl.in.cmake
index 0dae31f..d099666 100644
--- a/bin/batch/knl_ctestS.sl.in.cmake
+++ b/bin/batch/knl_ctestS.sl.in.cmake
@@ -9,7 +9,7 @@
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+CMD="ctest . -E PAR_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
diff --git a/bin/batch/ray_ctestP.lsf.in.cmake b/bin/batch/ray_ctestP.lsf.in.cmake
index 6b5316a..8ffaf8c 100644
--- a/bin/batch/ray_ctestP.lsf.in.cmake
+++ b/bin/batch/ray_ctestP.lsf.in.cmake
@@ -15,6 +15,6 @@
cd @HDF5_BINARY_DIR@
echo "Run parallel test command. Test output will be in build/ctestP.out"
-ctest . -R 'TEST_PAR|PH5DIFF|PERFORM|ph5example' -E t_cache_image -C Release -T test >& ctestP.out
+ctest . -R 'PAR_' -E t_cache_image -C Release -T test >& ctestP.out
echo "Done running ctest parallel command."
diff --git a/bin/batch/ray_ctestS.lsf.in.cmake b/bin/batch/ray_ctestS.lsf.in.cmake
index d23a513..5bd5c83 100644
--- a/bin/batch/ray_ctestS.lsf.in.cmake
+++ b/bin/batch/ray_ctestS.lsf.in.cmake
@@ -11,7 +11,7 @@
cd @HDF5_BINARY_DIR@
echo "Run command. Test output will be in build/ctestS.out"
-ctest . -E 'TEST_PAR|PH5DIFF|PERFORM|ph5example' -C Release -j 32 -T test >& ctestS.out
+ctest . -E 'PAR_' -C Release -j 32 -T test >& ctestS.out
##$CMD >& ctestS.out
echo "Done running command."