summaryrefslogtreecommitdiffstats
path: root/tools/h5diff/testh5diff.sh
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2010-02-18 16:51:12 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2010-02-18 16:51:12 (GMT)
commitee757e449bda1e93bade0802948023147e157228 (patch)
tree510356444e41821a9b8fbeb02708218d9b5f2317 /tools/h5diff/testh5diff.sh
parentc35f840bcd7df2510154d40b6135bbe37d6acfb5 (diff)
downloadhdf5-ee757e449bda1e93bade0802948023147e157228.zip
hdf5-ee757e449bda1e93bade0802948023147e157228.tar.gz
hdf5-ee757e449bda1e93bade0802948023147e157228.tar.bz2
[svn-r18273] Purpose:
bugzilla 1754: h5diff: support comparing through links. Description: Fix incorrect (or hanging) behavior in parallel mode when specifying invalid combination of command options. (ex: -v and -q , --no-dangling-links without --follow-links) Add relate test case Update h5diffgentest.c due to add test files this and previous time Note: svn #18266 (prior to this) svn #18164 (original check-in) Tested: h5committest (jam, amani and linew)
Diffstat (limited to 'tools/h5diff/testh5diff.sh')
-rwxr-xr-xtools/h5diff/testh5diff.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index d34931d..373fbfe 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -328,15 +328,17 @@ TOOLTEST h5diff_16_3.txt -v -p 0.02 $FILE1 $FILE1 g1/dset9 g1/dset10
# 1.7 verbose mode
TOOLTEST h5diff_17.txt -v $FILE1 $FILE2
-# 1.8 test 32-bit INFINITY
+# 1.7 test 32-bit INFINITY
TOOLTEST h5diff_171.txt -v $FILE1 $FILE1 /g1/fp19
-# 1.8 test 64-bit INFINITY
+# 1.7 test 64-bit INFINITY
TOOLTEST h5diff_172.txt -v $FILE1 $FILE1 /g1/fp20
# 1.8 quiet mode
TOOLTEST h5diff_18.txt -q $FILE1 $FILE2
+# 1.8 -v and -q
+TOOLTEST h5diff_18_1.txt -v -q $FILE1 $FILE2
# ##############################################################################
@@ -653,12 +655,7 @@ TOOLTEST h5diff_450.txt --follow-links -v $DANGLE_LINK_FILE1 $DANGLE_LINK_FILE2
TOOLTEST h5diff_451.txt --follow-links -v --no-dangling-links $DANGLE_LINK_FILE1 $DANGLE_LINK_FILE2
# try --no-dangling-links without --follow-links options
-if test -n "$pmode"; then
- # Skip this. Investigate later why act differently in pmode.
- SKIP --no-dangling-links $FILE13 $FILE13
-else
- TOOLTEST h5diff_452.txt --no-dangling-links $FILE13 $FILE13
-fi
+TOOLTEST h5diff_452.txt --no-dangling-links $FILE13 $FILE13
# dangling link found for soft links (FILE to FILE)
TOOLTEST h5diff_453.txt --follow-links -v --no-dangling-links $FILE13 $FILE13