summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-03-21 15:57:40 (GMT)
committerlrknox <lrknox>2017-03-24 01:03:27 (GMT)
commit972344e23141f4709c259322bc3480c9f437faae (patch)
tree1c4ff5f4c3421e61d0dbe0e72855bfc01b255c59 /tools/test
parent87dceab9deb7e1580b3c5a1216ac3a9003eb0a42 (diff)
downloadhdf5-972344e23141f4709c259322bc3480c9f437faae.zip
hdf5-972344e23141f4709c259322bc3480c9f437faae.tar.gz
hdf5-972344e23141f4709c259322bc3480c9f437faae.tar.bz2
Merge bin/h5vers changes from develop.
Pull version from configure for version test in h5repack_plugin.sh.in Update version to 1.10.2-snap0 for hdf5_1_10 branch.
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5repack/h5repack_plugin.sh.in3
-rw-r--r--tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl14
2 files changed, 9 insertions, 8 deletions
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index 3f577a9..0b28f78 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -246,9 +246,10 @@ TOOLTEST_DUMP()
##############################################################################
# prepare for test
COPY_TESTFILES_TO_TESTDIR
+version_str=`echo @H5_VERSION@ | awk -F"-" '{print $1}' | sed 's/\./,/g'`
# Run the test
-arg="h5repack_layout.h5 -v -f UD=260,4,9,1,10,1"
+arg="h5repack_layout.h5 -v -f UD=260,4,9,$version_str"
TOOLTEST_DUMP plugin_version_test $arg
arg="h5repack_layout.h5 -v -f UD=257,1,9"
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
index 7bac9c4..561ab14 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
@@ -11,7 +11,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 10 1 }
+ PARAMS { 9 1 10 2 }
}
}
FILLVALUE {