From 25fe692c5c5c37a904a0d2ba3f447e60396c30da Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Sat, 5 Jan 2019 07:49:19 -0600
Subject: [PATCH] Configure build directory in batch scripts.

---
 .../{sbatch_ctestP.sl => ctestP.sl.in.cmake}  |  3 +-
 .../{sbatch_ctestS.sl => ctestS.sl.in.cmake}  |  3 +-
 .../{knl_ctestP.sl => knl_ctestP.sl.in.cmake} |  4 +--
 .../{knl_ctestS.sl => knl_ctestS.sl.in.cmake} |  4 +--
 bin/batch/knl_ctestSP.sl                      | 28 -------------------
 bin/batch/sbatch_ctestSP.sl                   | 25 -----------------
 config/cmake/scripts/CTestScript.cmake        |  4 +--
 src/CMakeLists.txt                            |  4 +--
 8 files changed, 10 insertions(+), 65 deletions(-)
 rename bin/batch/{sbatch_ctestP.sl => ctestP.sl.in.cmake} (94%)
 rename bin/batch/{sbatch_ctestS.sl => ctestS.sl.in.cmake} (94%)
 rename bin/batch/{knl_ctestP.sl => knl_ctestP.sl.in.cmake} (89%)
 rename bin/batch/{knl_ctestS.sl => knl_ctestS.sl.in.cmake} (88%)
 delete mode 100644 bin/batch/knl_ctestSP.sl
 delete mode 100644 bin/batch/sbatch_ctestSP.sl

diff --git a/bin/batch/sbatch_ctestP.sl b/bin/batch/ctestP.sl.in.cmake
similarity index 94%
rename from bin/batch/sbatch_ctestP.sl
rename to bin/batch/ctestP.sl.in.cmake
index e967dce385..230a642748 100644
--- a/bin/batch/sbatch_ctestP.sl
+++ b/bin/batch/ctestP.sl.in.cmake
@@ -7,8 +7,7 @@
 #SBATCH --export=ALL
 #SBATCH --job-name=h5_ctestS
 
-
-cd build
+cd @HDF5_BINARY_DIR@
 CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
 
 echo "Run $CMD. Test output will be in build/ctestP.out"
diff --git a/bin/batch/sbatch_ctestS.sl b/bin/batch/ctestS.sl.in.cmake
similarity index 94%
rename from bin/batch/sbatch_ctestS.sl
rename to bin/batch/ctestS.sl.in.cmake
index a103356630..9802e13432 100644
--- a/bin/batch/sbatch_ctestS.sl
+++ b/bin/batch/ctestS.sl.in.cmake
@@ -7,8 +7,7 @@
 #SBATCH --export=ALL
 #SBATCH --job-name=h5_ctestS
 
-
-cd build
+cd @HDF5_BINARY_DIR@
 CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
 
 echo "Run $CMD. Test output will be in build/ctestS.out"
diff --git a/bin/batch/knl_ctestP.sl b/bin/batch/knl_ctestP.sl.in.cmake
similarity index 89%
rename from bin/batch/knl_ctestP.sl
rename to bin/batch/knl_ctestP.sl.in.cmake
index 3a03fe2200..687804b01f 100644
--- a/bin/batch/knl_ctestP.sl
+++ b/bin/batch/knl_ctestP.sl.in.cmake
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#SBATCH -p knl -C quad,flat
+#SBATCH -C knl,quad,cache
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
@@ -8,7 +8,7 @@
 #SBATCH --export=ALL
 #SBATCH --job-name=h5_ctestS
 
-cd build
+cd @HDF5_BINARY_DIR@
 #run parallel tests except t_cache_image test
 CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
 
diff --git a/bin/batch/knl_ctestS.sl b/bin/batch/knl_ctestS.sl.in.cmake
similarity index 88%
rename from bin/batch/knl_ctestS.sl
rename to bin/batch/knl_ctestS.sl.in.cmake
index 5b77c5b13b..de1335cdc4 100644
--- a/bin/batch/knl_ctestS.sl
+++ b/bin/batch/knl_ctestS.sl.in.cmake
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#SBATCH -p knl -C quad,flat
+#SBATCH -C knl,quad,cache
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
@@ -8,7 +8,7 @@
 #SBATCH --export=ALL
 #SBATCH --job-name=h5_ctestS
 
-cd build
+cd @HDF5_BINARY_DIR@
 CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
 
 echo "Run $CMD. Test output will be in build/ctestS.out"
diff --git a/bin/batch/knl_ctestSP.sl b/bin/batch/knl_ctestSP.sl
deleted file mode 100644
index 56da347684..0000000000
--- a/bin/batch/knl_ctestSP.sl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-#SBATCH -p knl -C quad,flat
-#SBATCH --nodes=1
-#SBATCH -t 01:00:00
-#SBATCH --mail-type=BEGIN,END,FAIL
-##SBATCH --mail-user=<username>@sandia.gov
-#SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestS
-
-module load cmake
-module load craype-hugepages4M
-
-cd build
-CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
-
-echo "Run $CMD. Test output will be in build/ctestS.out"
-$CMD  >& ctestS.out
-echo "Done running $CMD"
-
-
-#run parallel tests except t_cache_image test
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
-
-echo "Run $CMD. Test output will be in build/ctestP.out"
-$CMD >& ctestP.out
-echo "Done running $CMD"
-
diff --git a/bin/batch/sbatch_ctestSP.sl b/bin/batch/sbatch_ctestSP.sl
deleted file mode 100644
index 5d79d9be81..0000000000
--- a/bin/batch/sbatch_ctestSP.sl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-#SBATCH --nodes=1
-#SBATCH -t 01:00:00
-#SBATCH --mail-type=BEGIN,END,FAIL
-##SBATCH --mail-user=<username>@sandia.gov
-#SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestS
-
-
-cd build
-CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
-
-echo "Run $CMD. Test output will be in build/ctestS.out"
-$CMD  >& ctestS.out
-echo "Done running $CMD"
-
-
-#run parallel tests except t_cache_image test
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
-
-echo "Run $CMD. Test output will be in build/ctestP.out"
-$CMD >& ctestP.out
-echo "Done running $CMD"
-
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 3c866ff8fe..bfe9c4ec48 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -268,7 +268,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
         ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
       else ()
         file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
-        execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME})
+        execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
         message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
         execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
         while(result)
@@ -283,7 +283,7 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
           file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
           file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}.log ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}_Serial.log)
           unset(result CACHE)
-          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
           message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
           execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
           while(result)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 96cf7abc0e..ff7402b2ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -947,13 +947,13 @@ if (LOCAL_BATCH_TEST)
   if (LOCAL_BATCH_SCRIPT_NAME)
     configure_file (
         ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME}.in.cmake
-        ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME} ESCAPE_QUOTES @ONLY
+        ${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_NAME} ESCAPE_QUOTES @ONLY
     )
   endif ()
   if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
     configure_file (
         ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}.in.cmake
-        ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} ESCAPE_QUOTES @ONLY
+        ${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} ESCAPE_QUOTES @ONLY
     )
   endif ()
 endif ()