diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-03-02 18:11:19 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-03-02 18:11:19 (GMT) |
| commit | 0df90f9f796d543549a30a648e864932126b6f52 (patch) | |
| tree | 141b6bb54d6cf88b95c81f30bba9c30b0d4f078f /test | |
| parent | a04bf9bf7fa47fb3495d63d593efc0a23a36b1e1 (diff) | |
| parent | f4dd30f41ccee7bcd97fba065573c5201cbcc743 (diff) | |
| download | hdf5-0df90f9f796d543549a30a648e864932126b6f52.zip hdf5-0df90f9f796d543549a30a648e864932126b6f52.tar.gz hdf5-0df90f9f796d543549a30a648e864932126b6f52.tar.bz2 | |
Merge pull request #321 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f4dd30f41ccee7bcd97fba065573c5201cbcc743':
Update CMake formatting
Update CMake files and formatting
HDFFV-10120 verify nozlib checking with tools tests
cmake non-code typo
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2480758..9657971 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -283,7 +283,7 @@ set (H5_VDS_SWMR_TESTS foreach (test ${H5_VDS_SWMR_TESTS}) ADD_H5_EXE(${test}) -endforeach (test ${H5_VDS_SWMR_TESTS}) +endforeach () ############################################################################## ############################################################################## @@ -309,7 +309,7 @@ if (BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (cache_image-shared SHARED " " " ") target_link_libraries (cache_image-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_target_properties (cache_image-shared PROPERTIES FOLDER test) -endif (BUILD_SHARED_LIBS) +endif () #-- Adding test for hyperslab add_executable (hyperslab ${HDF5_TEST_SOURCE_DIR}/hyperslab.c) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 8b078d2..fc8587b 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -227,7 +227,7 @@ endif () add_custom_target(HDF5_TEST_LIB_files ALL COMMENT "Copying files needed by HDF5_TEST_LIB tests" DEPENDS ${HDF5_TEST_LIB_files_list}) if (BUILD_SHARED_LIBS) add_custom_target(HDF5_TEST_LIBSH_files ALL COMMENT "Copying files needed by HDF5_TEST_LIBSH tests" DEPENDS ${HDF5_TEST_LIBSH_files_list}) -endif() +endif () # Remove any output file left over from previous test run add_test (NAME H5TEST-clear-testhdf5-objects @@ -1060,7 +1060,7 @@ if (HDF5_TEST_VFD) endif () # Windows only macro - MACRO (CHECK_VFD_TEST vfdtest vfdname resultcode) + macro (CHECK_VFD_TEST vfdtest vfdname resultcode) if (${vfdtest} STREQUAL "flush1" OR ${vfdtest} STREQUAL "flush2") if (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split") if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug) @@ -1103,7 +1103,7 @@ if (HDF5_TEST_VFD) COMMAND ${CMAKE_COMMAND} -E echo "SKIP VFD-${vfdname}-${vfdtest}-shared" ) endif () - endif() + endif () else () add_test (NAME VFD-${vfdname}-${vfdtest} COMMAND "${CMAKE_COMMAND}" @@ -1168,9 +1168,9 @@ if (HDF5_TEST_VFD) ) endif () endif () - ENDMACRO () + endmacro () - MACRO (ADD_VFD_TEST vfdname resultcode) + macro (ADD_VFD_TEST vfdname resultcode) foreach (test ${H5_VFD_TESTS}) if (WIN32) CHECK_VFD_TEST (${test} ${vfdname} ${resultcode}) @@ -1257,7 +1257,7 @@ if (HDF5_TEST_VFD) ) endif () endif () - ENDMACRO () + endmacro () # Run test with different Virtual File Driver foreach (vfd ${VFD_LIST}) @@ -1273,13 +1273,13 @@ endif () ############################################################################## if (HDF5_BUILD_GENERATORS) - MACRO (ADD_H5_GENERATOR genfile) + macro (ADD_H5_GENERATOR genfile) add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c) TARGET_NAMING (${genfile} STATIC) TARGET_C_PROPERTIES (${genfile} STATIC " " " ") target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (${genfile} PROPERTIES FOLDER generator/test) - ENDMACRO () + endmacro () # generator executables set (H5_GENERATORS |