diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2013-02-20 18:43:47 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2013-02-20 18:43:47 (GMT) |
commit | 2c0357db8080e48f89f3a0160306c37c66f95b53 (patch) | |
tree | 5c410d92ec617ad3a1a4c979b4fa05f6a835832a /tools/h5copy/CMakeLists.txt | |
parent | 8a92fbce85ed5088fc1cabc8e40ac407218d06b8 (diff) | |
download | hdf5-2c0357db8080e48f89f3a0160306c37c66f95b53.zip hdf5-2c0357db8080e48f89f3a0160306c37c66f95b53.tar.gz hdf5-2c0357db8080e48f89f3a0160306c37c66f95b53.tar.bz2 |
[svn-r23307] HDFFV-8311: Correct test dependency
Remove h5ls references
Tested: local linux
Diffstat (limited to 'tools/h5copy/CMakeLists.txt')
-rw-r--r-- | tools/h5copy/CMakeLists.txt | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index 60e940a..7f68e76 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -44,9 +44,6 @@ IF (BUILD_TESTING) SET (LIST_OTHER_TEST_FILES ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out - ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_src.out.ls - ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.out.ls - ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copytst.out.ls ) FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") @@ -227,42 +224,6 @@ IF (BUILD_TESTING) ENDMACRO (ADD_H5_TEST_SAME) # - # Test result with h5ls - # - MACRO (ADD_H5LS_TEST infile filetest) - # If using memchecker add tests without using scripts - IF (HDF5_ENABLE_USING_MEMCHECKER) - ADD_TEST (NAME H5COPY-h5ls-${infile}-${filetest} COMMAND $<TARGET_FILE:h5ls> -Svr ./testfiles/${filetest}.out.h5) - IF (NOT "${last_test}" STREQUAL "") - SET_TESTS_PROPERTIES (H5COPY-h5ls-${infile}-${filetest} PROPERTIES DEPENDS ${last_test}) - ENDIF (NOT "${last_test}" STREQUAL "") - ELSE (HDF5_ENABLE_USING_MEMCHECKER) - # Remove any output file left over from previous test run - ADD_TEST ( - NAME H5COPY-h5ls-${infile}-${filetest}-clear-objects - COMMAND ${CMAKE_COMMAND} - -E remove - ./testfiles/${filetest}.out.h5 - ./testfiles/${filetest}.out.out - ./testfiles/${filetest}.out.out.err - ) - ADD_TEST ( - NAME H5COPY-h5ls-${file}-${filetest} - COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>" - -D "TEST_ARGS=-Svr;./testfiles/${filetest}.out.h5" - -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -D "TEST_OUTPUT=./testfiles/${filetest}.out.out" - -D "TEST_EXPECT=0" - -D "TEST_REFERENCE=./testfiles/${infile}.out.ls" - -D "TEST_MASK=true" - -P "${HDF5_RESOURCES_DIR}/runTest.cmake" - ) - SET_TESTS_PROPERTIES (H5COPY-h5ls-${infile}-${filetest} PROPERTIES DEPENDS H5COPY-h5ls-${infile}-${filetest}-clear-objects) - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) - ENDMACRO (ADD_H5LS_TEST) - - # # Similiar to ADD_H5_TEST macro. Compare to outputs from source & target # files instead of checking with h5ls. # @@ -399,20 +360,12 @@ IF (BUILD_TESTING) ADD_H5_TEST (C_D_simple 0 ${HDF_FILE1}.h5 -vp -s /grp_dsets/simple -d /C/D/simple) ADD_H5_TEST (E_F_grp_dsets 0 ${HDF_FILE1}.h5 -vp -s /grp_dsets -d /E/F/grp_dsets) ADD_H5_TEST (G_H_grp_nested 0 ${HDF_FILE1}.h5 -vp -s /grp_nested -d /G/H/grp_nested) - - # Verify that the file created above is correct - # This test is not independent of the above tests - #ADD_H5LS_TEST (${HDF_FILE1} basic) ############# COPY REFERENCES ############## # "Test copying object and region references" ADD_H5_F_TEST (region_ref 2 ${HDF_FILE2}.h5 ref -v -s / -d /COPY) - # Verify that the file created above is correct - # This test is not independent of the above tests - #ADD_H5LS_TEST (${HDF_FILE2} refs) - ############# COPY EXT LINKS ############## # "Test copying external link directly without -f ext" @@ -439,10 +392,6 @@ IF (BUILD_TESTING) # "Test copying a group contains external links with -f ext" ADD_H5_F_TEST (ext_link_group_f 2 ${HDF_EXT_SRC_FILE}.h5 ext -v -s /group_ext -d /copy2_group) - # Verify that the file created above is correct - # This test is not independent of the above tests - #ADD_H5LS_TEST (${HDF_EXT_SRC_FILE} links) - ############# Test misc. ############## #----------------------------------------------------------------- |