diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-31 20:18:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-31 20:18:58 (GMT) |
| commit | c4142e07ddd04a97f1039900192bc18dca969dfc (patch) | |
| tree | 3967ad6a6a5b90a92b326bb621709203208e2716 | |
| parent | 6cf541b6c254c780c685c696a1c2dd3a0dcbe2cf (diff) | |
| parent | 21d48c1d1f79cdfd1b816a5b7ba2e8694a16fbd6 (diff) | |
| download | hdf5-c4142e07ddd04a97f1039900192bc18dca969dfc.zip hdf5-c4142e07ddd04a97f1039900192bc18dca969dfc.tar.gz hdf5-c4142e07ddd04a97f1039900192bc18dca969dfc.tar.bz2 | |
Merge pull request #275 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '21d48c1d1f79cdfd1b816a5b7ba2e8694a16fbd6':
Fix Windows static only cache test checking
| -rw-r--r-- | test/CMakeTests.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 20d615b..8b078d2 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1055,10 +1055,11 @@ if (HDF5_TEST_VFD) # links_env unregister ) - if (NOT CYGWIN AND NOT WIN32) + if (NOT CYGWIN) set (H5_VFD_TESTS ${H5_VFD_TESTS} big cache) 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") @@ -1150,7 +1151,7 @@ if (HDF5_TEST_VFD) ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/${vfdname};HDF5TestExpress=${HDF_TEST_EXPRESS}" WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/${vfdname} ) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT ${vfdtest} STREQUAL "cache") add_test (NAME VFD-${vfdname}-${vfdtest}-shared COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}-shared>" |