summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-07-27 20:27:24 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-07-27 20:27:24 (GMT)
commit6e03d114c2dd0e21b509034cbc02226639e6ede7 (patch)
tree62a25a30303f12c4c466e518d75d588801e3bc6e
parent4bf118f09b4cf0ad720e053b0e01816182af9b64 (diff)
parent04d6a3ec3c91cb30dce5dd5abb1b67021527c2fb (diff)
downloadhdf5-6e03d114c2dd0e21b509034cbc02226639e6ede7.zip
hdf5-6e03d114c2dd0e21b509034cbc02226639e6ede7.tar.gz
hdf5-6e03d114c2dd0e21b509034cbc02226639e6ede7.tar.bz2
Merge pull request #617 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '04d6a3ec3c91cb30dce5dd5abb1b67021527c2fb': if PARALLEL copy seconf file to PAR folder
-rw-r--r--tools/test/h5diff/CMakeTests.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 02db446..608795c 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -316,6 +316,9 @@
endforeach ()
# copy second version of tvlstr.h5
HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
+ if (H5_HAVE_PARALLEL)
+ HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
+ endif ()
#