diff options
author | Jonathan Kim <jkm@hdfgroup.org> | 2011-04-12 23:02:33 (GMT) |
---|---|---|
committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-04-12 23:02:33 (GMT) |
commit | eb4a8c7e7da0fb01c71070e45fc05aad157aa9cd (patch) | |
tree | d1518cd91a8e9899d34e05f64018e463e93408bd | |
parent | 6fc1d0535960edf24e66ca14afc27b31ec2320db (diff) | |
download | hdf5-eb4a8c7e7da0fb01c71070e45fc05aad157aa9cd.zip hdf5-eb4a8c7e7da0fb01c71070e45fc05aad157aa9cd.tar.gz hdf5-eb4a8c7e7da0fb01c71070e45fc05aad157aa9cd.tar.bz2 |
[svn-r20488] Purpose:
Fix HDFFV-4342 : GMQS: h5dump test fails when source directory is read-only
Description:
Updated h5dump test case script to prevent entire test failure upon
source code directory is read-only.
Tested:
jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
-rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
-rw-r--r-- | tools/h5dump/testh5dump.sh.in | 3 | ||||
-rw-r--r-- | tools/testfiles/tall-6.ddl | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index d0811a6..7766ee1 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -517,6 +517,8 @@ Bug Fixes since HDF5-1.8.0 release Tools ----- + - Updated h5dump test case script to prevent entire test failure upon + source directory is read-only. Bug# HDFFV-4342 (JKM 2011/4/12) - Updated to unify option name to '--enable-error-stack' for printing HDF5 error stack messages for HDF5 tools. h5ls and h5dump for now. For h5ls, this replaces "-e/--errors" option, which is deprecated. diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index d7b6cbd..512238d 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -68,7 +68,6 @@ TESTING() { # non-zero value. # TOOLTEST() { - expect="$srcdir/../testfiles/$1" actual="../testfiles/`basename $1 .ddl`.out" actual_err="../testfiles/`basename $1 .ddl`.err" @@ -634,7 +633,7 @@ TOOLTEST textlink.ddl textlink.h5 TOOLTEST3 filter_fail.ddl --enable-error-stack filter_fail.h5 # test for -o -y for dataset with attributes -TOOLTEST tall-6.ddl -y -o data -d /g1/g1.1/dset1.1.1 tall.h5 +TOOLTEST1 tall-6.ddl -y -o $TESTDIR/data -d /g1/g1.1/dset1.1.1 tall.h5 # Report test results and exit if test $nerrors -eq 0 ; then diff --git a/tools/testfiles/tall-6.ddl b/tools/testfiles/tall-6.ddl index 199c7f3..a408608 100644 --- a/tools/testfiles/tall-6.ddl +++ b/tools/testfiles/tall-6.ddl @@ -1,6 +1,3 @@ -############################# -Expected output for 'h5dump -y -o data -d /g1/g1.1/dset1.1.1 tall.h5' -############################# HDF5 "tall.h5" { DATASET "/g1/g1.1/dset1.1.1" { DATATYPE H5T_STD_I32BE |