summaryrefslogtreecommitdiffstats
path: root/bin/batch
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-05-06 22:01:07 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-05-06 22:01:07 (GMT)
commit68e34f7be1309f77c616d0078d128da199ab050c (patch)
tree591c6f40f5d75551260baafbfa2c43d8c3607215 /bin/batch
parente0ff0e8dd5670d998cb580af9d2749214297492b (diff)
parentdf35529e3d0529e9df11806d267ef8c4779b79e3 (diff)
downloadhdf5-68e34f7be1309f77c616d0078d128da199ab050c.zip
hdf5-68e34f7be1309f77c616d0078d128da199ab050c.tar.gz
hdf5-68e34f7be1309f77c616d0078d128da199ab050c.tar.bz2
Merge pull request #1695 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'df35529e3d0529e9df11806d267ef8c4779b79e3': Putting ctest command in variable CMD did not work for skipping failing tests.
Diffstat (limited to 'bin/batch')
-rw-r--r--bin/batch/ctestP.sl.in.cmake6
-rw-r--r--bin/batch/knl_ctestP.sl.in.cmake6
2 files changed, 4 insertions, 8 deletions
diff --git a/bin/batch/ctestP.sl.in.cmake b/bin/batch/ctestP.sl.in.cmake
index 8d216d6..592d37d 100644
--- a/bin/batch/ctestP.sl.in.cmake
+++ b/bin/batch/ctestP.sl.in.cmake
@@ -8,9 +8,7 @@
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
-CMD="ctest . -R MPI_TEST_ -E t_cache_image -C Release -T test"
+ctest . -R MPI_TEST_ -E t_cache_image -C Release -T test >& ctestP.out
-echo "Run $CMD. Test output will be in build/ctestP.out"
-$CMD >& ctestP.out
-echo "Done running $CMD"
+echo "Done running ctestP.sl"
diff --git a/bin/batch/knl_ctestP.sl.in.cmake b/bin/batch/knl_ctestP.sl.in.cmake
index 79dfb89..73c5ac5 100644
--- a/bin/batch/knl_ctestP.sl.in.cmake
+++ b/bin/batch/knl_ctestP.sl.in.cmake
@@ -6,13 +6,11 @@
#SBATCH --mail-type=BEGIN,END,FAIL
##SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestS
+#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
#run parallel tests except t_cache_image test
-CMD="ctest . -R MPI_TEST_ -E t_cache_image -C Release -T test"
+ctest . -R MPI_TEST_ -E t_cache_image -C Release -T test >& ctestP.out
-echo "Run $CMD. Test output will be in build/ctestP.out"
-$CMD >& ctestP.out
echo "Done running $CMD"