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 /tools/test/h5import | |
| 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 'tools/test/h5import')
| -rw-r--r-- | tools/test/h5import/CMakeTests.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake index 521d138..15b36fc 100644 --- a/tools/test/h5import/CMakeTests.cmake +++ b/tools/test/h5import/CMakeTests.cmake @@ -80,7 +80,7 @@ ### T H E T E S T S M A C R O S ### ############################################################################## ############################################################################## - MACRO (ADD_H5_TEST testname importfile conffile testfile) + macro (ADD_H5_TEST testname importfile conffile testfile) # If using memchecker skip macro based tests if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME H5IMPORT-${testname} COMMAND $<TARGET_FILE:h5import> ${importfile} -c ${conffile} -o ${testfile}) @@ -126,9 +126,9 @@ ) set_tests_properties (H5IMPORT-${testname}-H5DMP_CMP PROPERTIES DEPENDS H5IMPORT-${testname}-H5DMP) endif () - ENDMACRO () + endmacro () - MACRO (ADD_H5_DUMPTEST testname datasetname testfile) + macro (ADD_H5_DUMPTEST testname datasetname testfile) # If using memchecker skip tests if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( @@ -194,16 +194,16 @@ ) set_tests_properties (H5IMPORT-DUMP-${testname}-H5DFF PROPERTIES DEPENDS "H5IMPORT-DUMP-${testname}") endif () - ENDMACRO () + endmacro () - MACRO (ADD_H5_SKIP_DUMPTEST testname datasetname testfile) + macro (ADD_H5_SKIP_DUMPTEST testname datasetname testfile) if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( NAME H5IMPORT-DUMP-${testname}-SKIPPED COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${testname} ${datasetname} ${testfile} --- DEFLATE filter not available" ) endif () - ENDMACRO () + endmacro () # -------------------------------------------------------------------- # Determine if filter is available for h5diff |