[svn-r19183] Corrected h5repack verbose test for windows

Updated tools/lib source dir variable for source list

Tested: local linux
This commit is contained in:
Allen Byrne 2010-08-06 12:53:52 -05:00
parent 5e2d5978e4
commit 6d22b60931
2 changed files with 21 additions and 21 deletions

View File

@ -198,12 +198,12 @@ IF (BUILD_TESTING)
NAME H5REPACK-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
-D "TEST_ARGS:STRING=${ARGN};${PROJECT_BINARY_DIR}/testfiles/${resultfile};${PROJECT_BINARY_DIR}/testfiles/out.${resultfile}"
-D "TEST_ARGS:STRING=${ARGN};testfiles/${resultfile};testfiles/out.${resultfile}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-D "TEST_OUTPUT=${resultfile}.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_FILTER=${testfilter}"
-D "TEST_REFERENCE=${PROJECT_BINARY_DIR}/testfiles/${resultfile}.ddl"
-D "TEST_FILTER:STRING=${testfilter}"
-D "TEST_REFERENCE=testfiles/${resultfile}.ddl"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
ENDIF (${testtype} STREQUAL "SKIP")

View File

@ -8,27 +8,27 @@ PROJECT (HDF5_TOOLS_LIB)
#INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
SET (H5_TOOLS_LIB_SRCS
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_array.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_attr.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_dset.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_util.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_filters.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_type.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c
${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_dset.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_util.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_filters.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_type.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.c
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.c
)
SET (H5_TOOLS_LIB_HDRS
${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.h
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.h
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.h
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.h
${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.h
${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.h
${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h
)
#-- Always build a static library for linking the ${HDF5_LIB_NAME} tools together