diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-09-19 15:56:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-09-19 15:56:26 (GMT) |
| commit | b2cb046d514861c54bd33a1ac85aa67ded3e240d (patch) | |
| tree | 90c796933b8ecb68dfd5a9852bfd3802793c63db | |
| parent | 8f991b6299a52f0f015ed6a8f9bf7da4a5d128ff (diff) | |
| parent | 5a8914a6a7dbb075c56a59f5e9728c0ec1dc3e39 (diff) | |
| download | hdf5-b2cb046d514861c54bd33a1ac85aa67ded3e240d.zip hdf5-b2cb046d514861c54bd33a1ac85aa67ded3e240d.tar.gz hdf5-b2cb046d514861c54bd33a1ac85aa67ded3e240d.tar.bz2 | |
Merge pull request #30 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '5a8914a6a7dbb075c56a59f5e9728c0ec1dc3e39':
HDFFV-9431: allow test to be run in unique vfd folder. Pulled from trunk
| -rw-r--r-- | c++/test/CMakeTests.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 4a4601a..91c36b0 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -39,6 +39,7 @@ if (HDF5_TEST_VFD) MACRO (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) + file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}") add_test ( NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects COMMAND ${CMAKE_COMMAND} @@ -58,7 +59,7 @@ if (HDF5_TEST_VFD) -D "TEST_VFD:STRING=${vfdname}" -D "TEST_EXPECT=${resultcode}" -D "TEST_OUTPUT=cpp_testhdf5" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}" -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects) |