diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-03 04:45:55 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-03 04:45:55 (GMT) |
commit | 30df67700cc95f1c08a0a2bc2b4cf38489f70a51 (patch) | |
tree | 7a7fe9e07d35ddd033d283b5986f0f3cf32a3769 /bin/batch | |
parent | 2d4f58adf0bd1774485686cea5d7c7c0ba8c2091 (diff) | |
parent | c348d453b583ec9092152e6aef1f7fa9854cf5d9 (diff) | |
download | hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.zip hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.tar.gz hdf5-30df67700cc95f1c08a0a2bc2b4cf38489f70a51.tar.bz2 |
Merge pull request #1517 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'c348d453b583ec9092152e6aef1f7fa9854cf5d9':
Correct H5DIFF to PH5DIFF in *ctestS.sl.in.cmake list of parallel tests reserved for *ctestP.sl.cmake. Revise options to run batch tests and alternative options for cross compile in HPC/*-HDF5options.cmake.
Change examples file to zip for CMake zip file.
Update bin/release for filename changes and HPC-CMake tar file corrections.
Add new files to MANIFEST. Update permissions for raybsub to 755.
Diffstat (limited to 'bin/batch')
-rw-r--r-- | bin/batch/cori_ctestS.sl.in.cmake | 2 | ||||
-rw-r--r-- | bin/batch/cori_knl_ctestS.sl.in.cmake | 2 | ||||
-rw-r--r-- | bin/batch/ctestS.lsf.in.cmake | 2 | ||||
-rw-r--r-- | bin/batch/ctestS.sl.in.cmake | 2 | ||||
-rw-r--r-- | bin/batch/ray_ctestS.lsf.in.cmake | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | bin/batch/raybsub | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/bin/batch/cori_ctestS.sl.in.cmake b/bin/batch/cori_ctestS.sl.in.cmake index 502db3f..cf68826 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|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test" +CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -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_ctestS.sl.in.cmake b/bin/batch/cori_knl_ctestS.sl.in.cmake index 0ec7bf7..7db4483 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|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test" +CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -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/ctestS.lsf.in.cmake b/bin/batch/ctestS.lsf.in.cmake index 5692574..7ef5af5 100644 --- a/bin/batch/ctestS.lsf.in.cmake +++ b/bin/batch/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|H5DIFF|PERFORM' -C Release -j 32 -T test >& ctestS.out +ctest . -E 'TEST_PAR|PH5DIFF|PERFORM' -C Release -j 32 -T test >& ctestS.out ##$CMD >& ctestS.out echo "Done running command." diff --git a/bin/batch/ctestS.sl.in.cmake b/bin/batch/ctestS.sl.in.cmake index f772be9..98c1bcd 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|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test" +CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -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_ctestS.lsf.in.cmake b/bin/batch/ray_ctestS.lsf.in.cmake index cbc7130..d23a513 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|H5DIFF|PERFORM|ph5example' -C Release -j 32 -T test >& ctestS.out +ctest . -E 'TEST_PAR|PH5DIFF|PERFORM|ph5example' -C Release -j 32 -T test >& ctestS.out ##$CMD >& ctestS.out echo "Done running command." diff --git a/bin/batch/raybsub b/bin/batch/raybsub index 19dceef..19dceef 100644..100755 --- a/bin/batch/raybsub +++ b/bin/batch/raybsub |