mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-10703 macro vars need quotes

Browse Source
This commit is contained in:
Allen Byrne 2019-02-15 16:04:06 -06:00
parent 122b63a5a2
commit 58e6e3e102
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/examples/datasets/CMakeLists.txt
View File

@ -71,7 +71,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
endforeach ()
MACRO (ADD_H5_TEST resultfile resultcode)
macro (ADD_H5_TEST resultfile resultcode)
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
add_test (
NAME JAVA_datasets-${resultfile}
@ -91,10 +91,9 @@ MACRO (ADD_H5_TEST resultfile resultcode)
set_tests_properties (JAVA_datasets-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "JAVA_datasets-${resultfile}")
ENDMACRO ()
endmacro ()
if (BUILD_TESTING)
foreach (example ${HDF_JAVA_EXAMPLES})
if (example STREQUAL "H5Ex_D_External")
add_test (

4
java/examples/groups/CMakeLists.txt
View File

@ -55,7 +55,7 @@ foreach (h5_file ${HDF_JAVA_TEST_FILES})
endforeach ()
add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
MACRO (ADD_H5_TEST resultfile resultcode)
macro (ADD_H5_TEST resultfile resultcode)
set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
add_test (
NAME JAVA_groups-${resultfile}
@ -75,7 +75,7 @@ MACRO (ADD_H5_TEST resultfile resultcode)
set_tests_properties (JAVA_groups-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "JAVA_groups-${resultfile}")
ENDMACRO ()
endmacro ()
if (BUILD_TESTING)
foreach (example ${HDF_JAVA_EXAMPLES})

4
test/CMakeTests.cmake
View File

@ -555,7 +555,7 @@ foreach (h5_test ${H5_TESTS})
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
else ()
if (h5_test STREQUAL "big" AND CYGWIN)
if ("${h5_test}" STREQUAL "big" AND CYGWIN)
add_test (NAME H5TEST-${h5_test}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}"
)
@ -598,7 +598,7 @@ if (BUILD_SHARED_LIBS)
foreach (h5_test ${H5_TESTS})
if (NOT h5_test IN_LIST H5TEST_SEPARATE_TESTS)
if (h5_test STREQUAL "big" AND CYGWIN)
if ("${h5_test}" STREQUAL "big" AND CYGWIN)
add_test (NAME H5TEST-shared-${h5_test}
COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}-shared"
)

6
test/CMakeVFDTests.cmake
View File

@ -109,8 +109,8 @@ endif ()
# Windows only macro
macro (CHECK_VFD_TEST vfdtest vfdname resultcode)
if (vfdtest STREQUAL "flush1" OR vfdtest STREQUAL "flush2")
if (vfdname STREQUAL "multi" OR vfdname STREQUAL "split")
if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
if (NOT BUILD_SHARED_LIBS AND NOT HDF_CFG_NAME MATCHES "Debug")
add_test (
NAME VFD-${vfdname}-${vfdtest}-clear-objects
@ -239,7 +239,7 @@ endif ()
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname}
)
if (BUILD_SHARED_LIBS AND NOT vfdtest STREQUAL "cache")
if (BUILD_SHARED_LIBS AND NOT "${vfdtest}" STREQUAL "cache")
add_test (
NAME VFD-${vfdname}-${vfdtest}-shared-clear-objects
COMMAND ${CMAKE_COMMAND}

6
test/CMakeVOLTests.cmake
View File

@ -106,8 +106,8 @@ endif ()
# Windows only macro
macro (CHECK_VOL_TEST voltest volname volinfo resultcode)
if (voltest STREQUAL "flush1" OR voltest STREQUAL "flush2")
if (volname STREQUAL "multi" OR volname STREQUAL "split")
if ("${voltest}" STREQUAL "flush1" OR "${voltest}" STREQUAL "flush2")
if ("${volname}" STREQUAL "multi" OR "${volname}" STREQUAL "split")
if (NOT BUILD_SHARED_LIBS AND NOT ${HDF_CFG_NAME} MATCHES "Debug")
add_test (
NAME VOL-${volname}-${voltest}-clear-objects
@ -236,7 +236,7 @@ endif ()
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${volname};HDF5TestExpress=${HDF_TEST_EXPRESS}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${volname}
)
if (BUILD_SHARED_LIBS AND NOT voltest STREQUAL "cache")
if (BUILD_SHARED_LIBS AND NOT "${voltest}" STREQUAL "cache")
add_test (
NAME VOL-${volname}-${voltest}-shared-clear-objects
COMMAND ${CMAKE_COMMAND}