diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2010-11-18 19:11:51 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2010-11-18 19:11:51 (GMT) |
commit | 64a7862ffef32f17f8ec6632c201c99a233f419f (patch) | |
tree | 4a8dc9f80c0b8f6b72a955ba89cad501079034a0 /test/CMakeLists.txt | |
parent | 116391d56a1142b08c4c02eb13ed8e4598af507b (diff) | |
download | hdf5-64a7862ffef32f17f8ec6632c201c99a233f419f.zip hdf5-64a7862ffef32f17f8ec6632c201c99a233f419f.tar.gz hdf5-64a7862ffef32f17f8ec6632c201c99a233f419f.tar.bz2 |
[svn-r19824] 1. Made fixes as in rev #19813 in trunk:
a) Add comments to test_4() in test/external.c about the name "/ link".
b) Fix one memory leak in src/H5Lexternal.c: free memory pointed to by tmp_env_prefix for HDF5_EXT_PREFIX case.
3. Made changes for bug #1930 as in rev #19783, #19781 in trunk.
4. Made corresponding CMake changes as in rev #19782 in trunk.
Diffstat (limited to 'test/CMakeLists.txt')
-rw-r--r-- | test/CMakeLists.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1bb1b48..158110b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -55,6 +55,7 @@ SET (HDF5_REFERENCE_FILES err_compat_2 error_test_1 error_test_2 + links_env.out ) FOREACH (ref_file ${HDF5_REFERENCE_FILES}) @@ -283,6 +284,7 @@ SET (H5_TESTS #err_compat tcheck_version testmeta + #links_env ) FOREACH (test ${H5_TESTS}) @@ -362,6 +364,24 @@ ADD_TEST (NAME error_test COMMAND "${CMAKE_COMMAND}" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) +#-- Adding test for links_env +ADD_EXECUTABLE (links_env ${HDF5_TEST_SOURCE_DIR}/links_env.c) +H5_NAMING (links_env) +TARGET_WIN_PROPERTIES (links_env) +TARGET_LINK_LIBRARIES (links_env ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) + +ADD_TEST (NAME links_env COMMAND "${CMAKE_COMMAND}" + -D "TEST_PROGRAM=$<TARGET_FILE:links_env>" + -D "TEST_ARGS:STRING=" + -D "TEST_ENV_VAR:STRING=HDF5_EXT_PREFIX" + -D "TEST_ENV_VALUE:STRING=.:tmp" + -D "TEST_EXPECT=0" + -D "TEST_OUTPUT=links_env.txt" + -D "TEST_REFERENCE=links_env.out" + -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" + -P "${HDF5_RESOURCES_DIR}/runTest.cmake" +) + IF (HDF5_TEST_VFD) SET (VFD_LIST @@ -421,6 +441,7 @@ IF (HDF5_TEST_VFD) err_compat tcheck_version testmeta + links_env ) IF (DIRECT_VFD) |