diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-03-21 17:07:42 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-03-21 17:07:42 (GMT) |
| commit | f09abb150e965200ac1b06a5bc4b374d8969776c (patch) | |
| tree | aaacae8b1bad787d0e340772ced6839fc612b935 /tools | |
| parent | 2fe63888b73c7d857bdcd7e67af3e7c3d13018cf (diff) | |
| parent | fa5ca5272d7aa6f25656541b72a24697b36dd52b (diff) | |
| download | hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.zip hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.tar.gz hdf5-f09abb150e965200ac1b06a5bc4b374d8969776c.tar.bz2 | |
Merge pull request #356 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fa5ca5272d7aa6f25656541b72a24697b36dd52b':
Remove extra space added by h5vers to version string in H5.java, which then failed to match the pattern after the first run.
Remove incorrect " marks added to java files by bin/h5vers. Pull version from configure for version test in h5repack_plugin.sh.in
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test/h5repack/h5repack_plugin.sh.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in index c7a9a6b..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,9,235" +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" |