From e0de04d355287d37187e707d03cc309c66d17510 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 1 May 2019 12:31:55 -0500
Subject: Separate out MPI tests that fail on MPI version

---
 testpar/CMakeTests.cmake | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index 214801b..e4f6dfb 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -25,10 +25,14 @@ add_test (NAME MPI_TEST-clear-testphdf5-objects
 )
 set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5)
 
+set (SKIP_testphdf5
+    cchunk3
+    tldsc
+)
 set (SKIP_testphdf5 "")
-#if (HDF5_OPENMPI_VERSION_SKIP)
-#  set (SKIP_testphdf5 "${SKIP_testphdf5};-x;ecdsetw")
-#endif ()
+foreach (skiptest SKIP_testphdf5)
+  set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}")
+endforeach ()
 
 add_test (NAME MPI_TEST_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} ${SKIP_testphdf5})
 set_tests_properties (MPI_TEST_testphdf5 PROPERTIES
@@ -41,6 +45,20 @@ if (last_test)
 endif ()
 set (last_test "MPI_TEST_testphdf5")
 
+#execute the skipped tests
+foreach (skiptest SKIP_testphdf5)
+  add_test (NAME MPI_TEST_testphdf5_${skiptest} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} -o ${skiptest})
+  set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES
+      FIXTURES_REQUIRED par_clear_testphdf5
+      ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
+      WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
+  )
+  if (last_test)
+    set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES DEPENDS ${last_test})
+  endif ()
+  set (last_test "MPI_TEST_testphdf5_${skiptest}")
+endforeach ()
+
 #if (HDF5_OPENMPI_VERSION_SKIP)
 #  list (REMOVE_ITEM H5P_TESTS t_shapesame)
 #endif ()
-- 
cgit v0.12


From 725f75baa7d85b9b269c9da07e24994c71dab728 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 1 May 2019 13:24:02 -0500
Subject: Correct varname

---
 testpar/CMakeTests.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index e4f6dfb..aaaa4a4 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -25,12 +25,12 @@ add_test (NAME MPI_TEST-clear-testphdf5-objects
 )
 set_tests_properties (MPI_TEST-clear-testphdf5-objects PROPERTIES FIXTURES_SETUP par_clear_testphdf5)
 
-set (SKIP_testphdf5
+set (SKIP_tests
     cchunk3
     tldsc
 )
 set (SKIP_testphdf5 "")
-foreach (skiptest SKIP_testphdf5)
+foreach (skiptest SKIP_tests)
   set (SKIP_testphdf5 "${SKIP_testphdf5};-x;${skiptest}")
 endforeach ()
 
@@ -46,7 +46,7 @@ endif ()
 set (last_test "MPI_TEST_testphdf5")
 
 #execute the skipped tests
-foreach (skiptest SKIP_testphdf5)
+foreach (skiptest SKIP_tests)
   add_test (NAME MPI_TEST_testphdf5_${skiptest} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS} -o ${skiptest})
   set_tests_properties (MPI_TEST_testphdf5_${skiptest} PROPERTIES
       FIXTURES_REQUIRED par_clear_testphdf5
-- 
cgit v0.12


From 854223e3fcf5e90ad5fae25ff05deb4276ce001b Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 1 May 2019 14:09:06 -0500
Subject: Add missing default

---
 config/cmake/scripts/HDF5config.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 805aee1..3c1271f 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -177,6 +177,7 @@ if (NOT DEFINED HPC)
     endif ()
   endif ()
 else ()
+  set (CTEST_SITE "HPC.XXXX")
   set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
   include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
 endif ()
-- 
cgit v0.12