diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-26 17:12:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-26 17:12:02 (GMT) |
| commit | 768636dbd77ea787a6a04dfc321ff3e862791db7 (patch) | |
| tree | 0b652e6e83aded1bfb10ead58c3550b057766944 /test | |
| parent | 05ea6be738343a94f7e2871920b27c0fb4435bc5 (diff) | |
| parent | c4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d (diff) | |
| download | hdf5-768636dbd77ea787a6a04dfc321ff3e862791db7.zip hdf5-768636dbd77ea787a6a04dfc321ff3e862791db7.tar.gz hdf5-768636dbd77ea787a6a04dfc321ff3e862791db7.tar.bz2 | |
Merge pull request #264 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c4c1ce8cc32aa9428dfb8a0d73bb4bffb7ae682d':
HDFFV-10046 Fix windows parse error
Disable SHARED cache test on windows
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeTests.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 0816b17..20f43bc 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -819,7 +819,7 @@ add_test (NAME H5TEST-testlibinfo if (BUILD_SHARED_LIBS) #-- Adding test for cache - if (NOT CYGWIN) + if (NOT CYGWIN AND NOT WIN32) add_test (NAME H5TEST-shared-clear-cache-objects COMMAND ${CMAKE_COMMAND} -E remove @@ -1022,7 +1022,7 @@ if (HDF5_TEST_VFD) # links_env unregister ) - if (NOT CYGWIN) + if (NOT CYGWIN AND NOT WIN32) set (H5_VFD_TESTS ${H5_VFD_TESTS} big cache) endif () @@ -1185,7 +1185,7 @@ if (HDF5_TEST_VFD) set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-istore-shared PROPERTIES TIMEOUT 1800) - if (NOT CYGWIN) + if (NOT CYGWIN AND NOT WIN32) set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) endif () endif () |