diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-06-09 18:52:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-06-09 18:52:43 (GMT) |
| commit | 0f4e97907cf40af09eece68546e45cf3f3e473b2 (patch) | |
| tree | a7884abd413dbe5e39101a5455e3650268e2e2a3 | |
| parent | 84311eb7018660f7546291c060d50dc2981edabe (diff) | |
| download | hdf5-0f4e97907cf40af09eece68546e45cf3f3e473b2.zip hdf5-0f4e97907cf40af09eece68546e45cf3f3e473b2.tar.gz hdf5-0f4e97907cf40af09eece68546e45cf3f3e473b2.tar.bz2 | |
[svn-r27172] Change disable to skip big test on cygwin
| -rw-r--r-- | test/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 20cf3ab..651e4eb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -190,7 +190,7 @@ set (H5_TESTS objcopy links unlink -# big + big mtime fillval mount @@ -223,9 +223,6 @@ set (H5_TESTS enc_dec_plist_with_endianess unregister ) -if (NOT CYGWIN) - set (H5_TESTS ${H5_TESTS} big) -endif (NOT CYGWIN) foreach (test ${H5_TESTS}) ADD_H5_EXE(${test}) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index f1cfb59..c7803f6 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -335,7 +335,14 @@ add_test ( ) foreach (test ${H5_TESTS}) - add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>) + if (${test} STREQUAL "big" AND CYGWIN) + add_test ( + NAME H5TEST-${test} + COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}" + ) + else (${test} STREQUAL "big" AND CYGWIN) + add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>) + endif (${test} STREQUAL "big" AND CYGWIN) set_tests_properties (H5TEST-${test} PROPERTIES DEPENDS H5TEST-clear-objects ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST" @@ -346,9 +353,7 @@ endforeach (test ${H5_TESTS}) set_tests_properties (H5TEST-flush2 PROPERTIES DEPENDS H5TEST-flush1) set_tests_properties (H5TEST-fheap PROPERTIES TIMEOUT 1800) set_tests_properties (H5TEST-testmeta PROPERTIES TIMEOUT 1800) -if (NOT CYGWIN) - set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800) -endif (NOT CYGWIN) +set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800) ############################################################################## ############################################################################## |