diff options
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/CMakeTests.cmake | 52 |
2 files changed, 33 insertions, 21 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8437e72..0b9911f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -258,7 +258,6 @@ set (H5_TESTS enc_dec_plist_cross_platform getname vfd - vfd_env ntypes dangle dtransform @@ -267,6 +266,7 @@ set (H5_TESTS freespace mf vds + vds_env file_image unregister cache_logging diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 470feef..8c4e1ce 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -685,15 +685,6 @@ endif () add_test ( NAME H5TEST-clear-external_env-objects COMMAND ${CMAKE_COMMAND} - -D "TEST_PROGRAM=$<TARGET_FILE:external_env>" - -D "TEST_ARGS:STRING=" - -D "TEST_ENV_VAR:STRING=HDF5_EXTFILE_PREFIX" - -D "TEST_ENV_VALUE:STRING=\${ORIGIN}" - -D "TEST_EXPECT=0" - -D "TEST_OUTPUT=external_env.txt" - -D "TEST_REFERENCE=external_env.out" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" -E remove extern_1r.raw extern_2r.raw @@ -709,7 +700,22 @@ add_test ( ${HDF5_TEST_BINARY_DIR}/H5TEST ) set_tests_properties (H5TEST-clear-external_env-objects PROPERTIES FIXTURES_SETUP external_env_clear_objects) -add_test (NAME H5TEST-external_env COMMAND $<TARGET_FILE:external_env>) +if (HDF5_ENABLE_USING_MEMCHECKER) + add_test (NAME H5TEST-external_env COMMAND $<TARGET_FILE:external_env>) +else () + add_test (NAME H5TEST-external_env COMMAND "${CMAKE_COMMAND}" + -D "TEST_PROGRAM=$<TARGET_FILE:external_env>" + -D "TEST_ARGS:STRING=" + -D "TEST_ENV_VAR:STRING=HDF5_EXTFILE_PREFIX" + -D "TEST_ENV_VALUE:STRING=\${ORIGIN}" + -D "TEST_EXPECT=0" + -D "TEST_SKIP_COMPARE=TRUE" + -D "TEST_OUTPUT=external_env.txt" + #-D "TEST_REFERENCE=external_env.out" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" + -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + ) +endif () set_tests_properties (H5TEST-external_env PROPERTIES FIXTURES_REQUIRED external_env_clear_objects ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}" @@ -720,15 +726,6 @@ set_tests_properties (H5TEST-external_env PROPERTIES add_test ( NAME H5TEST-clear-vds_env-objects COMMAND ${CMAKE_COMMAND} - -D "TEST_PROGRAM=$<TARGET_FILE:vds_env>" - -D "TEST_ARGS:STRING=" - -D "TEST_ENV_VAR:STRING=HDF5_VDS_PREFIX" - -D "TEST_ENV_VALUE:STRING=\${ORIGIN}/tmp" - -D "TEST_EXPECT=0" - -D "TEST_OUTPUT=vds_env.txt" - -D "TEST_REFERENCE=vds_env.out" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" -E remove vds_virt_0.h5 vds_virt_3.h5 @@ -739,7 +736,22 @@ add_test ( ${HDF5_TEST_BINARY_DIR}/H5TEST ) set_tests_properties (H5TEST-clear-vds_env-objects PROPERTIES FIXTURES_SETUP vds_env_clear_objects) -add_test (NAME H5TEST-vds_env COMMAND $<TARGET_FILE:vds_env>) +if (HDF5_ENABLE_USING_MEMCHECKER) + add_test (NAME H5TEST-vds_env COMMAND $<TARGET_FILE:vds_env>) +else () + add_test (NAME H5TEST-vds_env COMMAND "${CMAKE_COMMAND}" + -D "TEST_PROGRAM=$<TARGET_FILE:vds_env>" + -D "TEST_ARGS:STRING=" + -D "TEST_ENV_VAR:STRING=HDF5_VDS_PREFIX" + -D "TEST_ENV_VALUE:STRING=\${ORIGIN}/tmp" + -D "TEST_EXPECT=0" + -D "TEST_SKIP_COMPARE=TRUE" + -D "TEST_OUTPUT=vds_env.txt" + #-D "TEST_REFERENCE=vds_env.out" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST" + -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + ) +endif () set_tests_properties (H5TEST-vds_env PROPERTIES FIXTURES_REQUIRED vds_env_clear_objects ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}" |