[svn-r13417]

commented a test that fails cross platforms and renamed files
This commit is contained in:
Pedro Vicente Nunes 2007-02-27 11:34:56 -05:00
parent 1f38a7fb90
commit 9dcbb7557d
67 changed files with 132 additions and 148 deletions

130
MANIFEST
View File

@ -1276,71 +1276,71 @@
#test files for h5diff
./tools/testfiles/h5diff_10.wri
./tools/testfiles/h5diff_11.wri
./tools/testfiles/h5diff_12.wri
./tools/testfiles/h5diff_13.wri
./tools/testfiles/h5diff_14.wri
./tools/testfiles/h5diff_15.wri
./tools/testfiles/h5diff_16_1.wri
./tools/testfiles/h5diff_16_2.wri
./tools/testfiles/h5diff_16_3.wri
./tools/testfiles/h5diff_17.wri
./tools/testfiles/h5diff_18.wri
./tools/testfiles/h5diff_20.wri
./tools/testfiles/h5diff_21.wri
./tools/testfiles/h5diff_22.wri
./tools/testfiles/h5diff_23.wri
./tools/testfiles/h5diff_24.wri
./tools/testfiles/h5diff_25.wri
./tools/testfiles/h5diff_26.wri
./tools/testfiles/h5diff_27.wri
./tools/testfiles/h5diff_28.wri
./tools/testfiles/h5diff_50.wri
./tools/testfiles/h5diff_51.wri
./tools/testfiles/h5diff_52.wri
./tools/testfiles/h5diff_53.wri
./tools/testfiles/h5diff_54.wri
./tools/testfiles/h5diff_55.wri
./tools/testfiles/h5diff_56.wri
./tools/testfiles/h5diff_57.wri
./tools/testfiles/h5diff_58.wri
./tools/testfiles/h5diff_600.wri
./tools/testfiles/h5diff_601.wri
./tools/testfiles/h5diff_602.wri
./tools/testfiles/h5diff_603.wri
./tools/testfiles/h5diff_604.wri
./tools/testfiles/h5diff_605.wri
./tools/testfiles/h5diff_606.wri
./tools/testfiles/h5diff_607.wri
./tools/testfiles/h5diff_608.wri
./tools/testfiles/h5diff_609.wri
./tools/testfiles/h5diff_610.wri
./tools/testfiles/h5diff_611.wri
./tools/testfiles/h5diff_612.wri
./tools/testfiles/h5diff_613.wri
./tools/testfiles/h5diff_614.wri
./tools/testfiles/h5diff_615.wri
./tools/testfiles/h5diff_616.wri
./tools/testfiles/h5diff_617.wri
./tools/testfiles/h5diff_618.wri
./tools/testfiles/h5diff_619.wri
./tools/testfiles/h5diff_620.wri
./tools/testfiles/h5diff_621.wri
./tools/testfiles/h5diff_622.wri
./tools/testfiles/h5diff_623.wri
./tools/testfiles/h5diff_624.wri
./tools/testfiles/h5diff_625.wri
./tools/testfiles/h5diff_626.wri
./tools/testfiles/h5diff_627.wri
./tools/testfiles/h5diff_628.wri
./tools/testfiles/h5diff_629.wri
./tools/testfiles/h5diff_70.wri
./tools/testfiles/h5diff_80.wri
./tools/testfiles/h5diff_90.wri
./tools/testfiles/h5diff_100.wri
./tools/testfiles/h5diff_101.wri
./tools/testfiles/h5diff_102.wri
./tools/testfiles/h5diff_10.txt
./tools/testfiles/h5diff_11.txt
./tools/testfiles/h5diff_12.txt
./tools/testfiles/h5diff_13.txt
./tools/testfiles/h5diff_14.txt
./tools/testfiles/h5diff_15.txt
./tools/testfiles/h5diff_16_1.txt
#./tools/testfiles/h5diff_16_2.txt
./tools/testfiles/h5diff_16_3.txt
./tools/testfiles/h5diff_17.txt
./tools/testfiles/h5diff_18.txt
./tools/testfiles/h5diff_20.txt
./tools/testfiles/h5diff_21.txt
./tools/testfiles/h5diff_22.txt
./tools/testfiles/h5diff_23.txt
./tools/testfiles/h5diff_24.txt
./tools/testfiles/h5diff_25.txt
./tools/testfiles/h5diff_26.txt
./tools/testfiles/h5diff_27.txt
./tools/testfiles/h5diff_28.txt
./tools/testfiles/h5diff_50.txt
./tools/testfiles/h5diff_51.txt
./tools/testfiles/h5diff_52.txt
./tools/testfiles/h5diff_53.txt
./tools/testfiles/h5diff_54.txt
./tools/testfiles/h5diff_55.txt
./tools/testfiles/h5diff_56.txt
./tools/testfiles/h5diff_57.txt
./tools/testfiles/h5diff_58.txt
./tools/testfiles/h5diff_600.txt
./tools/testfiles/h5diff_601.txt
./tools/testfiles/h5diff_602.txt
./tools/testfiles/h5diff_603.txt
./tools/testfiles/h5diff_604.txt
./tools/testfiles/h5diff_605.txt
./tools/testfiles/h5diff_606.txt
./tools/testfiles/h5diff_607.txt
./tools/testfiles/h5diff_608.txt
./tools/testfiles/h5diff_609.txt
./tools/testfiles/h5diff_610.txt
./tools/testfiles/h5diff_611.txt
./tools/testfiles/h5diff_612.txt
./tools/testfiles/h5diff_613.txt
./tools/testfiles/h5diff_614.txt
./tools/testfiles/h5diff_615.txt
./tools/testfiles/h5diff_616.txt
./tools/testfiles/h5diff_617.txt
./tools/testfiles/h5diff_618.txt
./tools/testfiles/h5diff_619.txt
./tools/testfiles/h5diff_620.txt
./tools/testfiles/h5diff_621.txt
./tools/testfiles/h5diff_622.txt
./tools/testfiles/h5diff_623.txt
./tools/testfiles/h5diff_624.txt
./tools/testfiles/h5diff_625.txt
./tools/testfiles/h5diff_626.txt
./tools/testfiles/h5diff_627.txt
./tools/testfiles/h5diff_628.txt
./tools/testfiles/h5diff_629.txt
./tools/testfiles/h5diff_70.txt
./tools/testfiles/h5diff_80.txt
./tools/testfiles/h5diff_90.txt
./tools/testfiles/h5diff_100.txt
./tools/testfiles/h5diff_101.txt
./tools/testfiles/h5diff_102.txt
./tools/testfiles/h5diff_basic1.h5

View File

@ -172,8 +172,8 @@ STDERR_FILTER() {
#
TOOLTEST() {
expect="$srcdir/../testfiles/$1"
actual="../testfiles/`basename $1 .wri`.out"
actual_err="../testfiles/`basename $1 .wri`.err"
actual="../testfiles/`basename $1 .txt`.out"
actual_err="../testfiles/`basename $1 .txt`.err"
actual_sav=${actual}-sav
actual_err_sav=${actual_err}-sav
shift
@ -269,72 +269,72 @@ SKIP() {
# 1.0
TOOLTEST h5diff_10.wri -h
TOOLTEST h5diff_10.txt -h
# 1.1 normal mode
TOOLTEST h5diff_11.wri $FILE1 $FILE2
TOOLTEST h5diff_11.txt $FILE1 $FILE2
# 1.2 normal mode with objects
TOOLTEST h5diff_12.wri $FILE1 $FILE2 g1/dset1 g1/dset2
TOOLTEST h5diff_12.txt $FILE1 $FILE2 g1/dset1 g1/dset2
# 1.3 report mode
TOOLTEST h5diff_13.wri $FILE1 $FILE2 -r
TOOLTEST h5diff_13.txt $FILE1 $FILE2 -r
# 1.4 report mode with objects
TOOLTEST h5diff_14.wri $FILE1 $FILE2 -r g1/dset1 g1/dset2
TOOLTEST h5diff_14.txt $FILE1 $FILE2 -r g1/dset1 g1/dset2
# 1.5 with -d
TOOLTEST h5diff_15.wri $FILE1 $FILE2 -r -d 5 g1/dset3 g1/dset4
TOOLTEST h5diff_15.txt $FILE1 $FILE2 -r -d 5 g1/dset3 g1/dset4
# 1.6.1 with -p (int)
TOOLTEST h5diff_16_1.wri $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6
TOOLTEST h5diff_16_1.txt $FILE1 $FILE1 -v -p 0.02 g1/dset5 g1/dset6
# 1.6.2 with -p (unsigned long_long)
TOOLTEST h5diff_16_2.wri $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8
#TOOLTEST h5diff_16_2.txt $FILE1 $FILE1 -v -p 0.02 g1/dset7 g1/dset8
# 1.6.3 with -p (double)
TOOLTEST h5diff_16_3.wri $FILE1 $FILE1 -v -p 0.02 g1/dset9 g1/dset10
TOOLTEST h5diff_16_3.txt $FILE1 $FILE1 -v -p 0.02 g1/dset9 g1/dset10
# 1.7 verbose mode
TOOLTEST h5diff_17.wri $FILE1 $FILE2 -v
TOOLTEST h5diff_17.txt $FILE1 $FILE2 -v
# 1.8 quiet mode
TOOLTEST h5diff_18.wri $FILE1 $FILE2 -q
TOOLTEST h5diff_18.txt $FILE1 $FILE2 -q
# ##############################################################################
# # not comparable types
# ##############################################################################
# 2.0
TOOLTEST h5diff_20.wri $FILE3 $FILE3 -v dset g1
TOOLTEST h5diff_20.txt $FILE3 $FILE3 -v dset g1
# 2.1
TOOLTEST h5diff_21.wri $FILE3 $FILE3 -v dset l1
TOOLTEST h5diff_21.txt $FILE3 $FILE3 -v dset l1
# 2.2
TOOLTEST h5diff_22.wri $FILE3 $FILE3 -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.wri $FILE3 $FILE3 -v g1 g1
TOOLTEST h5diff_23.txt $FILE3 $FILE3 -v g1 g1
# 2.4
TOOLTEST h5diff_24.wri $FILE3 $FILE3 -v t1 t1
TOOLTEST h5diff_24.txt $FILE3 $FILE3 -v t1 t1
# 2.5
TOOLTEST h5diff_25.wri $FILE3 $FILE3 -v l1 l1
TOOLTEST h5diff_25.txt $FILE3 $FILE3 -v l1 l1
# 2.6
TOOLTEST h5diff_26.wri $FILE3 $FILE3 -v g1 g2
TOOLTEST h5diff_26.txt $FILE3 $FILE3 -v g1 g2
# 2.7
TOOLTEST h5diff_27.wri $FILE3 $FILE3 -v t1 t2
TOOLTEST h5diff_27.txt $FILE3 $FILE3 -v t1 t2
# 2.8
TOOLTEST h5diff_28.wri $FILE3 $FILE3 -v l1 l2
TOOLTEST h5diff_28.txt $FILE3 $FILE3 -v l1 l2
@ -343,31 +343,31 @@ TOOLTEST h5diff_28.wri $FILE3 $FILE3 -v l1 l2
# ##############################################################################
# 5.0
TOOLTEST h5diff_50.wri $FILE4 $FILE4 -v dset0a dset0b
TOOLTEST h5diff_50.txt $FILE4 $FILE4 -v dset0a dset0b
# 5.1
TOOLTEST h5diff_51.wri $FILE4 $FILE4 -v dset1a dset1b
TOOLTEST h5diff_51.txt $FILE4 $FILE4 -v dset1a dset1b
# 5.2
TOOLTEST h5diff_52.wri $FILE4 $FILE4 -v dset2a dset2b
TOOLTEST h5diff_52.txt $FILE4 $FILE4 -v dset2a dset2b
# 5.3
TOOLTEST h5diff_53.wri $FILE4 $FILE4 -v dset3a dset4b
TOOLTEST h5diff_53.txt $FILE4 $FILE4 -v dset3a dset4b
# 5.4
TOOLTEST h5diff_54.wri $FILE4 $FILE4 -v dset4a dset4b
TOOLTEST h5diff_54.txt $FILE4 $FILE4 -v dset4a dset4b
# 5.5
TOOLTEST h5diff_55.wri $FILE4 $FILE4 -v dset5a dset5b
TOOLTEST h5diff_55.txt $FILE4 $FILE4 -v dset5a dset5b
# 5.6
TOOLTEST h5diff_56.wri $FILE4 $FILE4 -v dset6a dset6b
TOOLTEST h5diff_56.txt $FILE4 $FILE4 -v dset6a dset6b
# 5.7
TOOLTEST h5diff_57.wri $FILE4 $FILE4 -v dset7a dset7b
TOOLTEST h5diff_57.txt $FILE4 $FILE4 -v dset7a dset7b
# 5.8 (region reference)
TOOLTEST h5diff_58.wri $FILE7 $FILE8 -v refreg
TOOLTEST h5diff_58.txt $FILE7 $FILE8 -v refreg
# ##############################################################################
# # Error messages
@ -375,41 +375,41 @@ TOOLTEST h5diff_58.wri $FILE7 $FILE8 -v refreg
# 6.0: Check if the command line number of arguments is less than 3
TOOLTEST h5diff_600.wri $FILE1
TOOLTEST h5diff_600.txt $FILE1
# 6.1: Check for invalid options
TOOLTEST h5diff_601.wri $FILE1 $FILE2 -x
TOOLTEST h5diff_601.txt $FILE1 $FILE2 -x
# ##############################################################################
# # -d
# ##############################################################################
# 6.2: no value
TOOLTEST h5diff_602.wri $FILE1 $FILE2 -d g1/dset3 g1/dset4
TOOLTEST h5diff_602.txt $FILE1 $FILE2 -d g1/dset3 g1/dset4
# 6.3: negative value
TOOLTEST h5diff_603.wri $FILE1 $FILE2 -d -4 g1/dset3 g1/dset4
TOOLTEST h5diff_603.txt $FILE1 $FILE2 -d -4 g1/dset3 g1/dset4
# 6.4: zero
TOOLTEST h5diff_604.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -d u g1/dset3 g1/dset4
TOOLTEST h5diff_605.txt $FILE1 $FILE2 -d u g1/dset3 g1/dset4
# 6.6: hexadecimal
TOOLTEST h5diff_606.wri $FILE1 $FILE2 -d 0x1 g1/dset3 g1/dset4
TOOLTEST h5diff_606.txt $FILE1 $FILE2 -d 0x1 g1/dset3 g1/dset4
# 6.7: string
TOOLTEST h5diff_607.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -d 1 g1/dset3 g1/dset4
TOOLTEST h5diff_610.txt $FILE1 $FILE2 -d 1 g1/dset3 g1/dset4
# ##############################################################################
@ -418,31 +418,31 @@ TOOLTEST h5diff_610.wri $FILE1 $FILE2 -d 1 g1/dset3 g1/dset4
# 6.11: no value
TOOLTEST h5diff_611.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -p -4 g1/dset3 g1/dset4
TOOLTEST h5diff_612.txt $FILE1 $FILE2 -p -4 g1/dset3 g1/dset4
# 6.13: zero
TOOLTEST h5diff_613.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -p u g1/dset3 g1/dset4
TOOLTEST h5diff_614.txt $FILE1 $FILE2 -p u g1/dset3 g1/dset4
# 6.15: hexadecimal
TOOLTEST h5diff_615.wri $FILE1 $FILE2 -p 0x1 g1/dset3 g1/dset4
TOOLTEST h5diff_615.txt $FILE1 $FILE2 -p 0x1 g1/dset3 g1/dset4
# 6.16: string
TOOLTEST h5diff_616.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
TOOLTEST h5diff_619.txt $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
@ -452,54 +452,54 @@ TOOLTEST h5diff_619.wri $FILE1 $FILE2 -p 0.005 g1/dset3 g1/dset4
# 6.20: no value
TOOLTEST h5diff_620.wri $FILE1 $FILE2 -n g1/dset3 g1/dset4
TOOLTEST h5diff_620.txt $FILE1 $FILE2 -n g1/dset3 g1/dset4
# 6.21: negative value
TOOLTEST h5diff_621.wri $FILE1 $FILE2 -n -4 g1/dset3 g1/dset4
TOOLTEST h5diff_621.txt $FILE1 $FILE2 -n -4 g1/dset3 g1/dset4
# 6.22: zero
TOOLTEST h5diff_622.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -n u g1/dset3 g1/dset4
TOOLTEST h5diff_623.txt $FILE1 $FILE2 -n u g1/dset3 g1/dset4
# 6.24: hexadecimal
TOOLTEST h5diff_624.wri $FILE1 $FILE2 -n 0x1 g1/dset3 g1/dset4
TOOLTEST h5diff_624.txt $FILE1 $FILE2 -n 0x1 g1/dset3 g1/dset4
# 6.25: string
TOOLTEST h5diff_625.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -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.wri $FILE1 $FILE2 -n 1 g1/dset3 g1/dset4
TOOLTEST h5diff_628.txt $FILE1 $FILE2 -n 1 g1/dset3 g1/dset4
# 6.29 non valid files
TOOLTEST h5diff_629.wri file1.h6 file2.h6
TOOLTEST h5diff_629.txt file1.h6 file2.h6
# ##############################################################################
# 7. attributes
# ##############################################################################
TOOLTEST h5diff_70.wri $FILE5 $FILE6 -v
TOOLTEST h5diff_70.txt $FILE5 $FILE6 -v
# ##############################################################################
# 8. all dataset datatypes
# ##############################################################################
TOOLTEST h5diff_80.wri $FILE7 $FILE8 -v
TOOLTEST h5diff_80.txt $FILE7 $FILE8 -v
# 9. compare a file with itself
TOOLTEST h5diff_90.wri $FILE1 $FILE1
TOOLTEST h5diff_90.txt $FILE1 $FILE1
# 10. read by hyperslab, print indexes
TOOLTEST h5diff_100.wri $FILE9 $FILE10 -v
TOOLTEST h5diff_100.txt $FILE9 $FILE10 -v
# 11. floating point comparison
TOOLTEST h5diff_101.wri $FILE1 $FILE1 /g1/d1 g1/d2 -v
TOOLTEST h5diff_102.wri $FILE1 $FILE1 /g1/fp1 g1/fp2 -v
TOOLTEST h5diff_101.txt $FILE1 $FILE1 /g1/d1 g1/d2 -v
TOOLTEST h5diff_102.txt $FILE1 $FILE1 /g1/fp1 g1/fp2 -v
# ##############################################################################
# # END

View File

@ -1,16 +0,0 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8'
#############################
dataset: </g1/dset7> and </g1/dset8>
size: [3x2] [3x2]
position dset7 dset8 difference relative
------------------------------------------------------------------------
[ 0 0 ] 100 120 20 0.200000
[ 0 1 ] 100 80 20 0.200000
[ 1 0 ] 100 0 100 1.000000
[ 1 1 ] 0 100 100 not comparable
[ 2 1 ] 100 50 50 0.500000
5 differences found
--------------------------------
Some objects are not comparable
--------------------------------