mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-09 07:32:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1662 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'cc5f91d1d2b1373fae57afc4e79a530b19343949':
  Fix CMake errors
This commit is contained in:
Allen Byrne 2019-04-18 11:44:50 -05:00
commit 80ec7cfd6a
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/CMakeLists.txt
View File

@ -258,7 +258,6 @@ set (H5_TESTS
enc_dec_plist_cross_platform enc_dec_plist_cross_platform
getname getname
vfd vfd
vfd_env
ntypes ntypes
dangle dangle
dtransform dtransform
@ -267,6 +266,7 @@ set (H5_TESTS
freespace freespace
mf mf
vds vds
vds_env
file_image file_image
unregister unregister
cache_logging cache_logging

52
test/CMakeTests.cmake
View File

@ -685,15 +685,6 @@ endif ()
add_test ( add_test (
NAME H5TEST-clear-external_env-objects NAME H5TEST-clear-external_env-objects
COMMAND ${CMAKE_COMMAND} 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 -E remove
extern_1r.raw extern_1r.raw
extern_2r.raw extern_2r.raw
@ -709,7 +700,22 @@ add_test (
${HDF5_TEST_BINARY_DIR}/H5TEST ${HDF5_TEST_BINARY_DIR}/H5TEST
) )
set_tests_properties (H5TEST-clear-external_env-objects PROPERTIES FIXTURES_SETUP external_env_clear_objects) 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 set_tests_properties (H5TEST-external_env PROPERTIES
FIXTURES_REQUIRED external_env_clear_objects FIXTURES_REQUIRED external_env_clear_objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}" ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"
@ -720,15 +726,6 @@ set_tests_properties (H5TEST-external_env PROPERTIES
add_test ( add_test (
NAME H5TEST-clear-vds_env-objects NAME H5TEST-clear-vds_env-objects
COMMAND ${CMAKE_COMMAND} 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 -E remove
vds_virt_0.h5 vds_virt_0.h5
vds_virt_3.h5 vds_virt_3.h5
@ -739,7 +736,22 @@ add_test (
${HDF5_TEST_BINARY_DIR}/H5TEST ${HDF5_TEST_BINARY_DIR}/H5TEST
) )
set_tests_properties (H5TEST-clear-vds_env-objects PROPERTIES FIXTURES_SETUP vds_env_clear_objects) 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 set_tests_properties (H5TEST-vds_env PROPERTIES
FIXTURES_REQUIRED vds_env_clear_objects FIXTURES_REQUIRED vds_env_clear_objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}" ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5TestExpress=${HDF_TEST_EXPRESS}"