summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Scot Breitenfeld <brtnfld@hdfgroup.org>2017-07-28 14:07:01 (GMT)
committerM. Scot Breitenfeld <brtnfld@hdfgroup.org>2017-07-28 14:07:01 (GMT)
commit668b90b96dcb237208dcedd63e0f2b7da8a0328c (patch)
treeb79b6c63cac5e3636afd02138ee6020ed71cce92
parentc08ee778588c9e0752e242c201000f1f11a0b742 (diff)
parent6e03d114c2dd0e21b509034cbc02226639e6ede7 (diff)
downloadhdf5-668b90b96dcb237208dcedd63e0f2b7da8a0328c.zip
hdf5-668b90b96dcb237208dcedd63e0f2b7da8a0328c.tar.gz
hdf5-668b90b96dcb237208dcedd63e0f2b7da8a0328c.tar.bz2
Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop
-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 ()
#