summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2012-10-03 04:36:22 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2012-10-03 04:36:22 (GMT)
commitd1a4ff0b3056b323ba4ae9e8b03f86115d7456e7 (patch)
treef67b3e7faeefc698aa51e12ec19c0be0583f5f96 /test
parentb151281b3897ae367aa520abe2877bc7183f4648 (diff)
parent3e59374ccd0c7cbb671dc72c34ec1a6a9123bc5b (diff)
downloadhdf5-d1a4ff0b3056b323ba4ae9e8b03f86115d7456e7.zip
hdf5-d1a4ff0b3056b323ba4ae9e8b03f86115d7456e7.tar.gz
hdf5-d1a4ff0b3056b323ba4ae9e8b03f86115d7456e7.tar.bz2
[svn-r22856] merge trunk up to 22855.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt44
-rw-r--r--test/Makefile.in2
2 files changed, 46 insertions, 0 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8e63326..5551fa3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -78,6 +78,47 @@ FOREACH (ref_file ${HDF5_REFERENCE_FILES})
ENDFOREACH (ref_file ${HDF5_REFERENCE_FILES})
# --------------------------------------------------------------------
+# Copy test files from test/testfiles/plist_files dir to test dir
+# --------------------------------------------------------------------
+SET (HDF5_REFERENCE_PLIST_FILES
+ acpl_be
+ acpl_le
+ dapl_be
+ dapl_le
+ dcpl_be
+ dcpl_le
+ dxpl_be
+ dxpl_le
+ fapl_be
+ fapl_le
+ fcpl_be
+ fcpl_le
+ gcpl_be
+ gcpl_le
+ lapl_be
+ lapl_le
+ lcpl_be
+ lcpl_le
+ ocpl_be
+ ocpl_le
+ ocpypl_be
+ ocpypl_le
+ strcpl_be
+ strcpl_le
+)
+
+FOREACH (plistfile ${HDF5_REFERENCE_PLIST_FILES})
+ SET (dest "${PROJECT_BINARY_DIR}/${plistfile}")
+ #MESSAGE (STATUS " Copying ${plistfile} to ${dset}")
+ ADD_CUSTOM_COMMAND (
+ TARGET ${HDF5_TEST_LIB_TARGET}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${HDF5_TEST_SOURCE_DIR}/testfiles/plist_files/${plistfile} ${dest}
+ )
+ENDFOREACH (plistfile ${HDF5_REFERENCE_PLIST_FILES})
+
+# --------------------------------------------------------------------
#-- Copy all the HDF5 files from the test directory into the source directory
# --------------------------------------------------------------------
SET (HDF5_REFERENCE_TEST_FILES
@@ -314,6 +355,8 @@ SET (H5_TESTS
testmeta
#links_env
file_image
+ enc_dec_plist
+ enc_dec_plist_with_endianess
)
FOREACH (test ${H5_TESTS})
@@ -638,6 +681,7 @@ IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
gen_specmetaread
gen_sizes_lheap
gen_file_image
+ gen_plist
)
FOREACH (gen ${H5_GENERATORS})
diff --git a/test/Makefile.in b/test/Makefile.in
index 6632526..5314d2e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -573,6 +573,7 @@ FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GPFS = @GPFS@
GREP = @GREP@
+H5BLD_STATIC = @H5BLD_STATIC@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
@@ -587,6 +588,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@
HDF5_HL = @HDF5_HL@
HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF5_USE_SHLIB = @HDF5_USE_SHLIB@
HDF_CXX = @HDF_CXX@
HDF_FORTRAN = @HDF_FORTRAN@
HDF_FORTRAN2003 = @HDF_FORTRAN2003@