diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-04-14 16:30:31 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-04-14 16:30:31 (GMT) |
| commit | 92897336ee3076160af74097b30308871c775366 (patch) | |
| tree | 8fb142da50567f5cd13673869314efa66bb1952c /tools/h5dump | |
| parent | ad86a38f7035f750887ba98be98e75cbcd6fcdf2 (diff) | |
| download | hdf5-92897336ee3076160af74097b30308871c775366.zip hdf5-92897336ee3076160af74097b30308871c775366.tar.gz hdf5-92897336ee3076160af74097b30308871c775366.tar.bz2 | |
[svn-r20494] Purpose:
Fixed HDFFV-4342 : GMQS: h5dump test fails when source directory is read-only
Description:
Merged from HDF5 trunk r20488 and r20490.
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), Cmake (jam, windows)
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 3 |
2 files changed, 20 insertions, 3 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 5149718..05688ec 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -47,7 +47,6 @@ IF (BUILD_TESTING) tall-3.ddl tall-4s.ddl tall-5s.ddl - tall-6.ddl tallfilters.ddl tarray1.ddl tarray1_big.ddl @@ -221,6 +220,11 @@ IF (BUILD_TESTING) tbin2.ddl tbin3.ddl tbin4.ddl + tall-6.ddl + texceedsubstart.ddl + texceedsubcount.ddl + texceedsubstride.ddl + texceedsubblock.ddl out3.h5import filter_fail.h5 packedbits.h5 @@ -751,6 +755,14 @@ IF (BUILD_TESTING) tindicessub3.out.err tindicessub4.out tindicessub4.out.err + texceedsubstart.out + texceedsubstart.out.err + texceedsubcount.out + texceedsubcount.out.err + texceedsubstride.out + texceedsubstride.out.err + texceedsubblock.out + texceedsubblock.out.err tindicesyes.out tindicesyes.out.err tlarge_objname.out @@ -1014,6 +1026,12 @@ IF (BUILD_TESTING) # 4D case ADD_H5_TEST (tindicessub4 0 -d 4d -s 0,0,1,2 -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2 taindices.h5) + # Exceed the dimensions for subsetting + ADD_H5_TEST (texceedsubstart 1 -d 1d -s 1,3 taindices.h5) + ADD_H5_TEST (texceedsubcount 1 -d 1d -c 1,3 taindices.h5) + ADD_H5_TEST (texceedsubstride 1 -d 1d -S 1,3 taindices.h5) + ADD_H5_TEST (texceedsubblock 1 -d 1d -k 1,3 taindices.h5) + # tests for filters # SZIP SET (TESTTYPE "TEST") diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index b5b82db..581d19a 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -71,7 +71,6 @@ TESTING() { # non-zero value. # TOOLTEST() { - expect="$srcdir/../testfiles/$1" actual="../testfiles/`basename $1 .ddl`.out" actual_err="../testfiles/`basename $1 .ddl`.err" @@ -640,7 +639,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 # test for dataset packed bits # Set up xCMD to test or skip. |