[svn-r12815]

1) added a new parameter to the h5diff function diff_array that contains
the beginning position of the hyperslab, so that the total position in
the array is printed correctly when reading by hyperslabs.
2) added a new test to h5diff  that reads and diffs by hyperslabs. The
test reads a 1GB dataset, from which a 1KB hyperslab was written with
differences .
3) added the generation of 2 files to the generator program to test the
h5diff hyperslab read.
4) changed the h5diff binary pre-generated file names to be more
descriptive (e.g, instead of file1.h5, made it h5diff_basic1.h5)
5) changed the name of the h5repack options text file to info.h5repack 

1 files changed, 85 insertions, 64 deletions

diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 044206a..697de8d 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -22,6 +22,23 @@
 #   Pedro Vicente Nunes, 10/25/2005
 #   Added test #9
 
+
+###############################################################################
+## test file names 
+###############################################################################
+
+FILE1=h5diff_basic1.h5
+FILE2=h5diff_basic2.h5
+FILE3=h5diff_types.h5
+FILE4=h5diff_dtypes.h5
+FILE5=h5diff_attr1.h5
+FILE6=h5diff_attr2.h5
+FILE7=h5diff_dset1.h5
+FILE8=h5diff_dset2.h5
+FILE9=h5diff_hyper1.h5
+FILE10=h5diff_hyper2.h5
+
+
 H5DIFF=h5diff               # The tool name
 H5DIFF_BIN=`pwd`/$H5DIFF    # The path of the tool binary
 
@@ -240,47 +257,47 @@ SKIP() {
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###			  T H E   T E S T S                                            ###
 ##############################################################################
 ##############################################################################
 
-# ##############################################################################
+# ############################################################################
 # # Common usage
-# ##############################################################################
+# ############################################################################
 
 
 # 1.0
 TOOLTEST h5diff_10.txt -h
 
 # 1.1 normal mode
-TOOLTEST h5diff_11.txt  file1.h5 file2.h5 
+TOOLTEST h5diff_11.txt  $FILE1 $FILE2 
 
 # 1.2 normal mode with objects
-TOOLTEST h5diff_12.txt  file1.h5 file2.h5  g1/dset1 g1/dset2
+TOOLTEST h5diff_12.txt  $FILE1 $FILE2  g1/dset1 g1/dset2
 
 # 1.3 report mode
-TOOLTEST h5diff_13.txt file1.h5 file2.h5 -r
+TOOLTEST h5diff_13.txt $FILE1 $FILE2 -r
 
 # 1.4 report  mode with objects
-TOOLTEST h5diff_14.txt  file1.h5 file2.h5  -r g1/dset1 g1/dset2
+TOOLTEST h5diff_14.txt  $FILE1 $FILE2  -r g1/dset1 g1/dset2
 
 # 1.5 with -d
-TOOLTEST h5diff_15.txt file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4
+TOOLTEST h5diff_15.txt $FILE1 $FILE2 -r -d 5 g1/dset3 g1/dset4
 
 # 1.6 with -p
-TOOLTEST h5diff_16.txt file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4
+TOOLTEST h5diff_16.txt $FILE1 $FILE2 -r -p 0.05 g1/dset3 g1/dset4
 
 # 1.7 verbose mode
-TOOLTEST h5diff_17.txt file1.h5 file2.h5 -v  
+TOOLTEST h5diff_17.txt $FILE1 $FILE2 -v  
 
 # 1.8 quiet mode 
-TOOLTEST h5diff_18.txt file1.h5 file2.h5 -q
+TOOLTEST h5diff_18.txt $FILE1 $FILE2 -q
 
 # 1.9.1 with -p (int)
-TOOLTEST h5diff_191.txt file1.h5 file1.h5 -v -p 0.02 g1/dset5 g1/dset6
+TOOLTEST h5diff_191.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6
 
 # 1.9.2 with -p (unsigned long_long)
-TOOLTEST h5diff_192.txt file1.h5 file1.h5 -v -p 0.02 g1/dset7 g1/dset8
+TOOLTEST h5diff_192.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8
 
 
 # ##############################################################################
@@ -288,68 +305,68 @@ TOOLTEST h5diff_192.txt file1.h5 file1.h5 -v -p 0.02 g1/dset7 g1/dset8
 # ##############################################################################
 
 # 2.0
-TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset g1
+TOOLTEST h5diff_20.txt $FILE3 $FILE3 -v dset g1
 
 # 2.1
-TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset l1
+TOOLTEST h5diff_21.txt $FILE3 $FILE3 -v dset l1
 
 # 2.2
-TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset t1
+TOOLTEST h5diff_22.txt $FILE3 $FILE3 -v dset t1
 
 # ##############################################################################
 # # compare groups, types, links (no differences and differences)
 # ##############################################################################
 
 # 2.3
-TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
+TOOLTEST h5diff_23.txt $FILE3 $FILE3 -v g1 g1
 
 # 2.4
-TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
+TOOLTEST h5diff_24.txt $FILE3 $FILE3 -v t1 t1
 
 # 2.5
-TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1 
+TOOLTEST h5diff_25.txt $FILE3 $FILE3 -v l1 l1 
 
 # 2.6
-TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
+TOOLTEST h5diff_26.txt $FILE3 $FILE3 -v g1 g2
 
 # 2.7
-TOOLTEST h5diff_27.txt file3.h5 file3.h5 -v t1 t2
+TOOLTEST h5diff_27.txt $FILE3 $FILE3 -v t1 t2
 
 # 2.8
-TOOLTEST h5diff_28.txt file3.h5 file3.h5 -v l1 l2
+TOOLTEST h5diff_28.txt $FILE3 $FILE3 -v l1 l2
 
 
 
 # ##############################################################################
-# # Dataset types
+# # Dataset datatypes
 # ##############################################################################
 
 # 5.0
-TOOLTEST h5diff_50.txt file4.h5 file4.h5 -v dset0a dset0b
+TOOLTEST h5diff_50.txt $FILE4 $FILE4 -v dset0a dset0b
 
 # 5.1
-TOOLTEST h5diff_51.txt file4.h5 file4.h5 -v dset1a dset1b
+TOOLTEST h5diff_51.txt $FILE4 $FILE4 -v dset1a dset1b
 
 # 5.2
-TOOLTEST h5diff_52.txt file4.h5 file4.h5 -v dset2a dset2b
+TOOLTEST h5diff_52.txt $FILE4 $FILE4 -v dset2a dset2b
 
 # 5.3
-TOOLTEST h5diff_53.txt file4.h5 file4.h5 -v dset3a dset4b
+TOOLTEST h5diff_53.txt $FILE4 $FILE4 -v dset3a dset4b
 
 # 5.4
-TOOLTEST h5diff_54.txt file4.h5 file4.h5 -v dset4a dset4b
+TOOLTEST h5diff_54.txt $FILE4 $FILE4 -v dset4a dset4b
 
 # 5.5
-TOOLTEST h5diff_55.txt file4.h5 file4.h5 -v dset5a dset5b
+TOOLTEST h5diff_55.txt $FILE4 $FILE4 -v dset5a dset5b
 
 # 5.6
-TOOLTEST h5diff_56.txt file4.h5 file4.h5 -v dset6a dset6b
+TOOLTEST h5diff_56.txt $FILE4 $FILE4 -v dset6a dset6b
 
 # 5.7
-TOOLTEST h5diff_57.txt file4.h5 file4.h5 -v dset7a dset7b
+TOOLTEST h5diff_57.txt $FILE4 $FILE4 -v dset7a dset7b
 
 # 5.8 (region reference)
-TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
+TOOLTEST h5diff_58.txt $FILE7 $FILE8 -v refreg
 
 # ##############################################################################
 # # Error messages
@@ -357,41 +374,41 @@ TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
 
 
 # 6.0: Check if the command line number of arguments is less than 3
-TOOLTEST h5diff_600.txt file1.h5 
+TOOLTEST h5diff_600.txt $FILE1 
 
 # 6.1: Check for invalid options
-TOOLTEST h5diff_601.txt file1.h5 file2.h5 -x 
+TOOLTEST h5diff_601.txt $FILE1 $FILE2 -x 
 
 # ##############################################################################
 # # -d 
 # ##############################################################################
 
 # 6.2: no value
-TOOLTEST h5diff_602.txt file1.h5 file2.h5  -d g1/dset3 g1/dset4
+TOOLTEST h5diff_602.txt $FILE1 $FILE2  -d g1/dset3 g1/dset4
 
 # 6.3: negative value
-TOOLTEST h5diff_603.txt file1.h5 file2.h5  -d -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_603.txt $FILE1 $FILE2  -d -4 g1/dset3 g1/dset4
 
 # 6.4: zero
-TOOLTEST h5diff_604.txt file1.h5 file2.h5  -d 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_604.txt $FILE1 $FILE2  -d 0 g1/dset3 g1/dset4
 
 # 6.5: non number
-TOOLTEST h5diff_605.txt file1.h5 file2.h5  -d u g1/dset3 g1/dset4
+TOOLTEST h5diff_605.txt $FILE1 $FILE2  -d u g1/dset3 g1/dset4
 
 # 6.6: hexadecimal
-TOOLTEST h5diff_606.txt file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_606.txt $FILE1 $FILE2 -d 0x1 g1/dset3 g1/dset4
 
 # 6.7: string
-TOOLTEST h5diff_607.txt file1.h5 file2.h5  -d "1" g1/dset3 g1/dset4
+TOOLTEST h5diff_607.txt $FILE1 $FILE2  -d "1" g1/dset3 g1/dset4
 
 # 6.8: repeated option
-TOOLTEST h5diff_608.txt file1.h5 file2.h5  -d 1 -d 2 g1/dset3 g1/dset4
+TOOLTEST h5diff_608.txt $FILE1 $FILE2  -d 1 -d 2 g1/dset3 g1/dset4
 
 # 6.9: number larger than biggest difference
-TOOLTEST h5diff_609.txt file1.h5 file2.h5  -d 200 g1/dset3 g1/dset4
+TOOLTEST h5diff_609.txt $FILE1 $FILE2  -d 200 g1/dset3 g1/dset4
 
 # 6.10: number smaller than smallest difference
-TOOLTEST h5diff_610.txt file1.h5 file2.h5  -d 1 g1/dset3 g1/dset4
+TOOLTEST h5diff_610.txt $FILE1 $FILE2  -d 1 g1/dset3 g1/dset4
 
 
 # ##############################################################################
@@ -400,31 +417,31 @@ TOOLTEST h5diff_610.txt file1.h5 file2.h5  -d 1 g1/dset3 g1/dset4
 
 
 # 6.11: no value
-TOOLTEST h5diff_611.txt file1.h5 file2.h5 -r -p g1/dset3 g1/dset4
+TOOLTEST h5diff_611.txt $FILE1 $FILE2 -r -p g1/dset3 g1/dset4
 
 # 6.12: negative value
-TOOLTEST h5diff_612.txt file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_612.txt $FILE1 $FILE2 -p -4 g1/dset3 g1/dset4
 
 # 6.13: zero
-TOOLTEST h5diff_613.txt file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_613.txt $FILE1 $FILE2 -p 0 g1/dset3 g1/dset4
 
 # 6.14: non number
-TOOLTEST h5diff_614.txt file1.h5 file2.h5 -p u g1/dset3 g1/dset4
+TOOLTEST h5diff_614.txt $FILE1 $FILE2 -p u g1/dset3 g1/dset4
 
 # 6.15: hexadecimal
-TOOLTEST h5diff_615.txt file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_615.txt $FILE1 $FILE2 -p 0x1 g1/dset3 g1/dset4
 
 # 6.16: string
-TOOLTEST h5diff_616.txt file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4
+TOOLTEST h5diff_616.txt $FILE1 $FILE2 -p "0.21" g1/dset3 g1/dset4
 
 # 6.17: repeated option
-TOOLTEST h5diff_617.txt file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4
+TOOLTEST h5diff_617.txt $FILE1 $FILE2 -p 0.21 -p 0.22 g1/dset3 g1/dset4
 
 # 6.18: number larger than biggest difference
-TOOLTEST h5diff_618.txt file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4
+TOOLTEST h5diff_618.txt $FILE1 $FILE2 -p 2 g1/dset3 g1/dset4
 
 # 6.19: number smaller than smallest difference
-TOOLTEST h5diff_619.txt file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4
+TOOLTEST h5diff_619.txt $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
 
 
 
@@ -434,31 +451,31 @@ TOOLTEST h5diff_619.txt file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4
 
 
 # 6.20: no value
-TOOLTEST h5diff_620.txt file1.h5 file2.h5 -n g1/dset3 g1/dset4
+TOOLTEST h5diff_620.txt $FILE1 $FILE2 -n g1/dset3 g1/dset4
 
 # 6.21: negative value
-TOOLTEST h5diff_621.txt file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4
+TOOLTEST h5diff_621.txt $FILE1 $FILE2 -n -4 g1/dset3 g1/dset4
 
 # 6.22: zero
-TOOLTEST h5diff_622.txt file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4
+TOOLTEST h5diff_622.txt $FILE1 $FILE2 -n 0 g1/dset3 g1/dset4
 
 # 6.23: non number
-TOOLTEST h5diff_623.txt file1.h5 file2.h5 -n u g1/dset3 g1/dset4
+TOOLTEST h5diff_623.txt $FILE1 $FILE2 -n u g1/dset3 g1/dset4
 
 # 6.24: hexadecimal
-TOOLTEST h5diff_624.txt file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4
+TOOLTEST h5diff_624.txt $FILE1 $FILE2 -n 0x1 g1/dset3 g1/dset4
 
 # 6.25: string
-TOOLTEST h5diff_625.txt file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4
+TOOLTEST h5diff_625.txt $FILE1 $FILE2 -n "2" g1/dset3 g1/dset4
 
 # 6.26: repeated option
-TOOLTEST h5diff_626.txt file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4
+TOOLTEST h5diff_626.txt $FILE1 $FILE2 -n 2 -n 3 g1/dset3 g1/dset4
 
 # 6.27: number larger than biggest difference
-TOOLTEST h5diff_627.txt file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4
+TOOLTEST h5diff_627.txt $FILE1 $FILE2 -n 200 g1/dset3 g1/dset4
 
 # 6.28: number smaller than smallest difference
-TOOLTEST h5diff_628.txt file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4
+TOOLTEST h5diff_628.txt $FILE1 $FILE2 -n 1 g1/dset3 g1/dset4
 
 # ##############################################################################
 # 6.29  non valid files
@@ -470,17 +487,21 @@ TOOLTEST h5diff_629.txt file1.h6 file2.h6
 # 7.  attributes
 # ##############################################################################
 
-TOOLTEST h5diff_70.txt file5.h5 file6.h5 -v
+TOOLTEST h5diff_70.txt $FILE5 $FILE6 -v
 
 # ##############################################################################
 # 8.  all dataset datatypes
 # ##############################################################################
 
-TOOLTEST h5diff_80.txt file7.h5 file8.h5 -v
+TOOLTEST h5diff_80.txt $FILE7 $FILE8 -v
 
 # 9. compare a file with itself
 
-TOOLTEST h5diff_90.txt file1.h5 file1.h5
+TOOLTEST h5diff_90.txt $FILE1 $FILE1
+
+# 10. read by hyperslab, print indexes
+
+TOOLTEST h5diff_100.txt $FILE9 $FILE10 -v
 
 # ##############################################################################
 # # END