philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10703 Update CMake commands to latest standard

Browse Source
This commit is contained in:
Allen Byrne
2019-02-15 15:48:24 -06:00
parent 6ea0dafa41
commit 122b63a5a2
48 changed files with 335 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
testpar/CMakeLists.txt
View File

@@ -58,8 +58,8 @@ set (H5P_TESTS
t_filters_parallel
)
foreach (testp ${H5P_TESTS})
ADD_H5P_EXE(${testp})
foreach (h5_testp ${H5P_TESTS})
ADD_H5P_EXE(${h5_testp})
endforeach ()
include (CMakeTests.cmake)

18
testpar/CMakeTests.cmake
View File

@@ -26,7 +26,7 @@ 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 "")
#if (${HDF5_OPENMPI_VERSION_SKIP})
#if (HDF5_OPENMPI_VERSION_SKIP)
# set (SKIP_testphdf5 "${SKIP_testphdf5};-x;ecdsetw")
#endif ()
@@ -36,12 +36,12 @@ set_tests_properties (MPI_TEST_testphdf5 PROPERTIES
ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
)
if (NOT "${last_test}" STREQUAL "")
if (last_test)
set_tests_properties (MPI_TEST_testphdf5 PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "MPI_TEST_testphdf5")
#if (${HDF5_OPENMPI_VERSION_SKIP})
#if (HDF5_OPENMPI_VERSION_SKIP)
# list (REMOVE_ITEM H5P_TESTS t_shapesame)
#endif ()
@@ -74,17 +74,17 @@ add_test (NAME MPI_TEST-clear-objects
)
set_tests_properties (MPI_TEST-clear-objects PROPERTIES FIXTURES_SETUP par_clear_objects)
foreach (testp ${H5P_TESTS})
add_test (NAME MPI_TEST_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS})
set_tests_properties (MPI_TEST_${testp} PROPERTIES
foreach (h5_testp ${H5P_TESTS})
add_test (NAME MPI_TEST_${h5_testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${h5_testp}> ${MPIEXEC_POSTFLAGS})
set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES
FIXTURES_REQUIRED par_clear_objects
ENVIRONMENT "HDF5_ALARM_SECONDS=3600;srcdir=${HDF5_TEST_PAR_BINARY_DIR}"
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}
)
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (MPI_TEST_${testp} PROPERTIES DEPENDS ${last_test})
if (last_test)
set_tests_properties (MPI_TEST_${h5_testp} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "MPI_TEST_${testp}")
set (last_test "MPI_TEST_${h5_testp}")
endforeach ()
# The t_pflush1 test is hard-coded to fail.

22
testpar/CMakeVFDTests.cmake
View File

@@ -39,27 +39,27 @@ endforeach ()
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
foreach (test ${H5P_VFD_TESTS})
foreach (h5_test ${H5P_VFD_TESTS})
add_test (
NAME MPI_TEST_VFD-${vfdname}-${test}-clear-objects
NAME MPI_TEST_VFD-${vfdname}-${h5_test}-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
${vfdname}-shared/${vfdname}-${test}.out
${vfdname}-shared/${vfdname}-${test}.out.err
${vfdname}-shared/${vfdname}-${h5_test}.out
${vfdname}-shared/${vfdname}-${h5_test}.out.err
)
add_test (
NAME MPI_TEST_VFD-${vfdname}-${test}
NAME MPI_TEST_VFD-${vfdname}-${h5_test}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
-D "TEST_PROGRAM=$<TARGET_FILE:${h5_test}>"
-D "TEST_ARGS:STRING="
-D "TEST_VFD:STRING=${vfdname}"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_OUTPUT=${vfdname}-${test}.out"
-D "TEST_OUTPUT=${vfdname}-${h5_test}.out"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (MPI_TEST_VFD-${vfdname}-${test} PROPERTIES
DEPENDS MPI_TEST_VFD-${vfdname}-${test}-clear-objects
set_tests_properties (MPI_TEST_VFD-${vfdname}-${h5_test} PROPERTIES
DEPENDS MPI_TEST_VFD-${vfdname}-${h5_test}-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}"
WORKING_DIRECTORY ${HDF5_TEST_PAR_BINARY_DIR}/${vfdname}
)
@@ -68,6 +68,6 @@ endforeach ()
endmacro ()
# Run test with different Virtual File Driver
foreach (vfd ${VFD_LIST})
ADD_VFD_TEST (${vfd} 0)
foreach (h5_vfd ${VFD_LIST})
ADD_VFD_TEST (${h5_vfd} 0)
endforeach ()