summaryrefslogtreecommitdiffstats
path: root/tools/testfiles
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2006-10-26 17:48:36 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2006-10-26 17:48:36 (GMT)
commit469f6d30b1b6641f62bda85f31ca2b3c03dba428 (patch)
treea7defd1ebc6aa6ee4150f09a6cf16b7fa75005d6 /tools/testfiles
parent254262e35b538e09ff95eefc9a276fb390243861 (diff)
downloadhdf5-469f6d30b1b6641f62bda85f31ca2b3c03dba428.zip
hdf5-469f6d30b1b6641f62bda85f31ca2b3c03dba428.tar.gz
hdf5-469f6d30b1b6641f62bda85f31ca2b3c03dba428.tar.bz2
[svn-r12819]
h5diff: print a message of "not comparable" in a case where the relative error compare is not possible, due to the denominator being zero. Modified the test file generator program to include a example for this and a new test on the shell script
Diffstat (limited to 'tools/testfiles')
-rw-r--r--tools/testfiles/h5diff_15.txt12
-rw-r--r--tools/testfiles/h5diff_16.txt25
-rw-r--r--tools/testfiles/h5diff_17.txt2
-rw-r--r--tools/testfiles/h5diff_basic1.h5bin4336 -> 6416 bytes
-rw-r--r--tools/testfiles/h5diff_basic2.h5bin4240 -> 4240 bytes
5 files changed, 22 insertions, 17 deletions
diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt
index 7f47408..30f5aa2 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/testfiles/h5diff_15.txt
@@ -4,10 +4,8 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g
Dataset: </g1/dset3> and </g1/dset4>
position dset3 dset4 difference
------------------------------------------------------------
-[ 0 0 ] 100.000000 110.000000 10.000000
-[ 0 1 ] 110.000000 100.000000 10.000000
-[ 1 0 ] 100.000000 90.000000 10.000000
-[ 1 1 ] 100.000000 80.000000 20.000000
-[ 2 0 ] 100.000000 140.000000 40.000000
-[ 2 1 ] 100.000000 200.000000 100.000000
-6 differences found
+[ 0 1 ] 100.000000 120.000000 20.000000
+[ 1 0 ] 100.000000 160.000000 60.000000
+[ 2 0 ] 100.000000 80.000000 20.000000
+[ 2 1 ] 100.000000 40.000000 60.000000
+4 differences found
diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt
index 7e1ed34..a0855c3 100644
--- a/tools/testfiles/h5diff_16.txt
+++ b/tools/testfiles/h5diff_16.txt
@@ -1,13 +1,18 @@
#############################
-Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -p 0.05 g1/dset3 g1/dset4'
+Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10 -p 0.01 -v'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
-position dset3 dset4 difference relative
+Dataset: </g1/dset9> and </g1/dset10>
+position dset9 dset10 difference relative
------------------------------------------------------------------------
-[ 0 0 ] 100 110 10 0.1
-[ 0 1 ] 110 100 10 0.09090909091
-[ 1 0 ] 100 90 10 0.1
-[ 1 1 ] 100 80 20 0.2
-[ 2 0 ] 100 140 40 0.4
-[ 2 1 ] 100 200 100 1
-6 differences found
+[ 0 0 ] 100 105 5 0.05
+[ 0 1 ] 100 120 20 0.2
+[ 1 0 ] 100 160 60 0.6
+[ 1 1 ] 100 95 5 0.05
+[ 2 0 ] 100 80 20 0.2
+[ 2 1 ] 100 40 60 0.6
+[ 3 0 ] 1 0 1 1
+[ 3 1 ] 0 1 1 not comparable
+8 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index ada1c0a..1119ebb 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -6,6 +6,7 @@ file1 file2
---------------------------------------
x x /g1
x x /g1/dset1
+ x /g1/dset10
x /g1/dset2
x /g1/dset3
x /g1/dset4
@@ -13,6 +14,7 @@ file1 file2
x /g1/dset6
x /g1/dset7
x /g1/dset8
+ x /g1/dset9
x /g2
Group: </g1> and </g1>
diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/testfiles/h5diff_basic1.h5
index 7282220..58c399f 100644
--- a/tools/testfiles/h5diff_basic1.h5
+++ b/tools/testfiles/h5diff_basic1.h5
Binary files differ
diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/testfiles/h5diff_basic2.h5
index 8f65bfe..aa7e81e 100644
--- a/tools/testfiles/h5diff_basic2.h5
+++ b/tools/testfiles/h5diff_basic2.h5
Binary files differ