summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-08-30 17:56:46 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-08-30 17:56:46 (GMT)
commitdce6ead20051d769957b5ac28766a3b640e91dc6 (patch)
tree3e03487f4266ed611abc89080d8da147d61c14cf
parent3b878ea9d9afb8cb186597d876b569304976d74f (diff)
parent203b2b2e75816bfd0f4d54ecd2cb1f41b1247447 (diff)
downloadhdf5-dce6ead20051d769957b5ac28766a3b640e91dc6.zip
hdf5-dce6ead20051d769957b5ac28766a3b640e91dc6.tar.gz
hdf5-dce6ead20051d769957b5ac28766a3b640e91dc6.tar.bz2
Merge pull request #2 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '203b2b2e75816bfd0f4d54ecd2cb1f41b1247447': Windows returns -1 instaed of 255 as on linux for the test
-rw-r--r--tools/h5repack/CMakeTests.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake
index cad675e..d0aa6c8 100644
--- a/tools/h5repack/CMakeTests.cmake
+++ b/tools/h5repack/CMakeTests.cmake
@@ -1147,7 +1147,11 @@
ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,1,9)
ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE)
# check for no parameters
- ADD_H5_CMP_TEST (plugin_zero "" "TEST" 255 h5repack_layout.h5 -v -f UD=250,0)
+ set (TESTRETVAL 255)
+ if (WIN32)
+ set (TESTRETVAL -1)
+ endif()
+ ADD_H5_CMP_TEST (plugin_zero "" "TEST" ${TESTRETVAL} h5repack_layout.h5 -v -f UD=250,0)
if (HDF5_TEST_VFD)
# Run test with different Virtual File Driver