summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-05-01 21:42:50 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-05-01 21:42:50 (GMT)
commit2f406b89554f9ebcb85258b662e404645399ed0d (patch)
tree91b2fc9903b85d57cb514710bc1d63b96f7ce960
parentc30a24bb166c8d8f27a41cd939f7bdd541ebccd0 (diff)
parentee35fb8a7fe3804e4146c54020b6e2272ab251e3 (diff)
downloadhdf5-2f406b89554f9ebcb85258b662e404645399ed0d.zip
hdf5-2f406b89554f9ebcb85258b662e404645399ed0d.tar.gz
hdf5-2f406b89554f9ebcb85258b662e404645399ed0d.tar.bz2
Merge pull request #1687 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ee35fb8a7fe3804e4146c54020b6e2272ab251e3': Change default for HPC Correct var usage syntax
-rw-r--r--config/cmake/scripts/HDF5config.cmake2
-rw-r--r--testpar/CMakeTests.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 3c1271f..8262829 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -177,7 +177,7 @@ if (NOT DEFINED HPC)
endif ()
endif ()
else ()
- set (CTEST_SITE "HPC.XXXX")
+ set (CTEST_SITE "${SITE_OS_NAME}")
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
include (${CTEST_SOURCE_DIRECTORY}/config/cmake/scripts/HPC/${HPC}-HDF5options.cmake)
endif ()
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index aaaa4a4..4faa86b 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -30,7 +30,7 @@ set (SKIP_tests
tldsc
)
set (SKIP_testphdf5 "")
-foreach (skiptest SKIP_tests)
+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_tests)
+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