diff options
| -rw-r--r-- | CTestConfig.cmake | 2 | ||||
| -rw-r--r-- | perform/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | testpar/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tools/h5diff/CMakeLists.txt | 2 |
4 files changed, 24 insertions, 20 deletions
diff --git a/CTestConfig.cmake b/CTestConfig.cmake index a0f256c..e12832a 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -4,7 +4,7 @@ ## # The following are required to uses Dart and the Cdash dashboard ## ENABLE_TESTING() ## INCLUDE(CTest) -SET (CTEST_PROJECT_NAME "HDF5 Trunk") +SET (CTEST_PROJECT_NAME "HDF5") SET (CTEST_DROP_METHOD "http") IF (CDASH_LOCAL) diff --git a/perform/CMakeLists.txt b/perform/CMakeLists.txt index 15db402..8be3b48 100644 --- a/perform/CMakeLists.txt +++ b/perform/CMakeLists.txt @@ -138,7 +138,7 @@ ADD_CUSTOM_COMMAND ( # Remove any output file left over from previous test run ADD_TEST ( - NAME h5perform-clear-objects + NAME PERFORM_h5perform-clear-objects COMMAND ${CMAKE_COMMAND} -E remove chunk.h5 @@ -151,31 +151,31 @@ ADD_TEST ( x-gnuplot ) -ADD_TEST (NAME h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>) +ADD_TEST (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>) IF (HDF5_BUILD_PERFORM_STANDALONE) - ADD_TEST (NAME h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>) + ADD_TEST (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>) ENDIF (HDF5_BUILD_PERFORM_STANDALONE) -ADD_TEST (NAME chunk COMMAND $<TARGET_FILE:chunk>) +ADD_TEST (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>) -ADD_TEST (NAME iopipe COMMAND $<TARGET_FILE:iopipe>) +ADD_TEST (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>) -ADD_TEST (NAME overhead COMMAND $<TARGET_FILE:overhead>) +ADD_TEST (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>) -ADD_TEST (NAME perf_meta COMMAND $<TARGET_FILE:perf_meta>) +ADD_TEST (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>) -ADD_TEST (NAME zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h") -ADD_TEST (NAME zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5) +ADD_TEST (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h") +ADD_TEST (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5) IF (H5_HAVE_PARALLEL) - ADD_TEST (NAME h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>) + ADD_TEST (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>) IF (HDF5_BUILD_PERFORM_STANDALONE) - ADD_TEST (NAME h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>) + ADD_TEST (NAME PERFORM_h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>) ENDIF (HDF5_BUILD_PERFORM_STANDALONE) - ADD_TEST (NAME benchpar COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:benchpar>) + ADD_TEST (NAME PERFORM_benchpar COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:benchpar>) - ADD_TEST (NAME mpi-perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:mpi-perf>) + ADD_TEST (NAME PERFORM_mpi-perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:mpi-perf>) ENDIF (H5_HAVE_PARALLEL) diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 781cdc2..d0ba668 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -24,19 +24,19 @@ ADD_EXECUTABLE (testphdf5 ${testphdf5_SRCS}) TARGET_NAMING (testphdf5 ${LIB_TYPE}) TARGET_LINK_LIBRARIES (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) -ADD_TEST (NAME testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>) +ADD_TEST (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>) MACRO (ADD_H5P_TEST file) ADD_EXECUTABLE (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c) TARGET_NAMING (${file} ${LIB_TYPE}) TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) - ADD_TEST (NAME ${file} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${file}>) + ADD_TEST (NAME TEST_PAR_${file} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${file}>) ENDMACRO (ADD_H5P_TEST file) SET (H5P_TESTS t_mpi - t_posix_compliant +# t_posix_compliant t_cache t_pflush1 t_pflush2 @@ -44,11 +44,15 @@ SET (H5P_TESTS ) FOREACH (testp ${H5P_TESTS}) - ADD_H5P_TEST(${testp}) + ADD_H5P_TEST(${testp}) ENDFOREACH (testp ${H5P_TESTS}) -SET_TESTS_PROPERTIES(t_pflush2 PROPERTIES DEPENDS t_pflush1) +SET_TESTS_PROPERTIES(TEST_PAR_t_pflush2 PROPERTIES DEPENDS TEST_PAR_t_pflush1) +IF (NOT WIN32) + ADD_H5P_TEST(t_posix_compliant) +ENDIF (NOT WIN32) + IF (HDF5_TEST_VFD) SET (VFD_LIST diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 4cc140a..2de9a42 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -376,7 +376,7 @@ IF (BUILD_TESTING) ADD_TEST ( NAME PH5DIFF-${resultfile} COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:ph5diff>" + -D "TEST_PROGRAM=${MPIEXEC};${MPIEXEC_PREFLAGS};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_POSTFLAGS};$<TARGET_FILE:ph5diff>" -D "TEST_ARGS:STRING=${ARGN}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${resultfile}.out" |