diff options
Diffstat (limited to 'tools/testfiles')
54 files changed, 139 insertions, 356 deletions
diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt index fd731f1..f291c68 100644 --- a/tools/testfiles/h5diff_10.txt +++ b/tools/testfiles/h5diff_10.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff -h' ############################# -$h5diff -h Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] file1 File name of the first HDF5 file @@ -10,6 +9,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt index 803b81f..d0c1aad 100644 --- a/tools/testfiles/h5diff_11.txt +++ b/tools/testfiles/h5diff_11.txt @@ -1,14 +1,10 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset3a dset3b' +Expected output for 'h5diff file1.h5 file2.h5 g1/dset1 g1/dset2' ############################# -$h5diff file6.h5 file6.h5 dset3a dset3b -Comparing </dset3a> with </dset3b> -position dset3a dset3b difference +position dset1 dset2 difference ------------------------------------------------------------ -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - - +[ 0 1 ] 1.000000 1.100000 0.100000 +[ 1 0 ] 1.000000 1.010000 0.010000 +[ 1 1 ] 1.000000 1.001000 0.001000 +[ 2 0 ] 1.000000 1.000100 0.000100 +[ 2 1 ] 1.000000 1.000000 0.000000 diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt index 3fd7989..ad9afa4 100644 --- a/tools/testfiles/h5diff_12.txt +++ b/tools/testfiles/h5diff_12.txt @@ -1,12 +1,11 @@ ############################# -Expected output for 'h5diff file1.h5 file2.h5 -n 2 g1/dset1 g1/dset2' +Expected output for 'h5diff file1.h5 file2.h5 -v -n 2 g1/dset1 g1/dset2' ############################# -$h5diff file1.h5 file2.h5 -n 2 g1/dset1 g1/dset2 -Comparing </g1/dset1> with </g1/dset2> +$h5diff file1.h5 file2.h5 -v -n 2 g1/dset1 g1/dset2 +Dataset: </g1/dset1> and </g1/dset2> position dset1 dset2 difference ------------------------------------------------------------ -[ 0 1 ] 1 1.1 0.1 -[ 1 0 ] 1 1.01 0.01 +[ 0 1 ] 1.000000 1.100000 0.100000 +[ 1 0 ] 1.000000 1.010000 0.010000 2 differences found - diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index d6ee768..406b01a 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -1,16 +1,15 @@ ############################# -Expected output for 'h5diff file1.h5 file2.h5 -d 5 g1/dset3 g1/dset4' +Expected output for 'h5diff file1.h5 file2.h5 -v -d 5 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 5 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> +$h5diff file1.h5 file2.h5 -v -d 5 g1/dset3 g1/dset4 +Dataset: </g1/dset3> and </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -[ 1 1 ] 100 80 20 -[ 2 0 ] 100 140 40 -[ 2 1 ] 100 200 100 +[ 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 - diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 95cad0a..8efcf83 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff file1.h5 file2.h5 -p 0.05 g1/dset3 g1/dset4' +Expected output for 'h5diff file1.h5 file2.h5 -v -p 0.05 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0.05 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> +$h5diff file1.h5 file2.h5 -v -p 0.05 g1/dset3 g1/dset4 +Dataset: </g1/dset3> and </g1/dset4> position dset3 dset4 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 110 10 0.1 @@ -13,4 +13,3 @@ position dset3 dset4 difference relative [ 2 1 ] 100 200 100 1 6 differences found - diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index 3577f88..2ad177b 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -1,6 +1,7 @@ ############################# -Expected output for 'h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2' +Expected output for 'h5diff file1.h5 file2.h5 -v -r g1/dset1 g1/dset2' ############################# -$h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2 -Object <g1/dset2> could not be found in <file1.h5> +$h5diff file1.h5 file2.h5 -v -r g1/dset1 g1/dset2 +Dataset: </g1/dset1> and </g1/dset2> +5 differences found diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index eeb5f71..a71a14f 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -1,96 +1,10 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5' +Expected output for 'h5diff file1.h5 file2.h5' ############################# -$h5diff file6.h5 file6.h5 -file1 file2 ---------------------------------------- - x x /dset0a - x x /dset0b - x x /dset10a - x x /dset10b - x x /dset1a - x x /dset1b - x x /dset2a - x x /dset2b - x x /dset3a - x x /dset3b - x x /dset4a - x x /dset4b - x x /dset5a - x x /dset5b - x x /dset6a - x x /dset6b - x x /dset7a - x x /dset7b - x x /dset8a - x x /dset8b - x x /dset9a - x x /dset9b - -Comparing </dset0a> with </dset0a> -0 differences found - -Comparing </dset0b> with </dset0b> -0 differences found - -Comparing </dset10a> with </dset10a> -0 differences found - -Comparing </dset10b> with </dset10b> -0 differences found - -Comparing </dset1a> with </dset1a> -0 differences found - -Comparing </dset1b> with </dset1b> -0 differences found - -Comparing </dset2a> with </dset2a> -0 differences found - -Comparing </dset2b> with </dset2b> -0 differences found - -Comparing </dset3a> with </dset3a> -0 differences found - -Comparing </dset3b> with </dset3b> -0 differences found - -Comparing </dset4a> with </dset4a> -0 differences found - -Comparing </dset4b> with </dset4b> -0 differences found - -Comparing </dset5a> with </dset5a> -0 differences found - -Comparing </dset5b> with </dset5b> -0 differences found - -Comparing </dset6a> with </dset6a> -0 differences found - -Comparing </dset6b> with </dset6b> -0 differences found - -Comparing </dset7a> with </dset7a> -0 differences found - -Comparing </dset7b> with </dset7b> -0 differences found - -Comparing </dset8a> with </dset8a> -0 differences found - -Comparing </dset8b> with </dset8b> -0 differences found - -Comparing </dset9a> with </dset9a> -0 differences found - -Comparing </dset9b> with </dset9b> -0 differences found - - +position dset1 dset1 difference +------------------------------------------------------------ +[ 0 1 ] 1.000000 1.100000 0.100000 +[ 1 0 ] 1.000000 1.010000 0.010000 +[ 1 1 ] 1.000000 1.001000 0.001000 +[ 2 0 ] 1.000000 1.000100 0.000100 +[ 2 1 ] 1.000000 1.000000 0.000000 diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt index ef4439a..6896f3e 100644 --- a/tools/testfiles/h5diff_20.txt +++ b/tools/testfiles/h5diff_20.txt @@ -1,7 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 dset group' +Expected output for 'h5diff file3.h5 file3.h5 -v dset group' ############################# -$h5diff file3.h5 file3.h5 dset group -Comparison not supported -</dset> is of type H5G_DATASET and </group> is of type H5G_GROUP +$h5diff file3.h5 file3.h5 -v dset group +Comparison not possible: </dset> is of type H5G_DATASET and </group> is of type H5G_GROUP diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt index 12804b8..15f91b6 100644 --- a/tools/testfiles/h5diff_21.txt +++ b/tools/testfiles/h5diff_21.txt @@ -1,7 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 dset link' +Expected output for 'h5diff file3.h5 file3.h5 -v dset link' ############################# -$h5diff file3.h5 file3.h5 dset link -Comparison not supported -</dset> is of type H5G_DATASET and </link> is of type H5G_LINK +$h5diff file3.h5 file3.h5 -v dset link +Comparison not possible: </dset> is of type H5G_DATASET and </link> is of type H5G_LINK diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt index 9e5ce85..a518e7e 100644 --- a/tools/testfiles/h5diff_22.txt +++ b/tools/testfiles/h5diff_22.txt @@ -1,7 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 dset type' +Expected output for 'h5diff file3.h5 file3.h5 -v dset type' ############################# -$h5diff file3.h5 file3.h5 dset type -Comparison not supported -</dset> is of type H5G_DATASET and </type> is of type H5G_TYPE +$h5diff file3.h5 file3.h5 -v dset type +Comparison not possible: </dset> is of type H5G_DATASET and </type> is of type H5G_TYPE diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt index d04763f..ee20e1d 100644 --- a/tools/testfiles/h5diff_23.txt +++ b/tools/testfiles/h5diff_23.txt @@ -1,8 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 group group' +Expected output for 'h5diff file3.h5 file3.h5 -v group group' ############################# -$h5diff file3.h5 file3.h5 group group -Comparison not supported -</group> is of type H5G_GROUP and </group> is of type H5G_GROUP - +$h5diff file3.h5 file3.h5 -v group group +Group: </group> and </group> diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt index 82a11d5..dc1ebb0 100644 --- a/tools/testfiles/h5diff_24.txt +++ b/tools/testfiles/h5diff_24.txt @@ -1,8 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 type type' +Expected output for 'h5diff file3.h5 file3.h5 -v type type' ############################# -$h5diff file3.h5 file3.h5 type type -Comparison not supported -</type> is of type H5G_TYPE and </type> is of type H5G_TYPE - +$h5diff file3.h5 file3.h5 -v type type +Datatype: </type> and </type> diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt index a4f56f0..1bbffac 100644 --- a/tools/testfiles/h5diff_25.txt +++ b/tools/testfiles/h5diff_25.txt @@ -1,8 +1,6 @@ ############################# -Expected output for 'h5diff file3.h5 file3.h5 link link' +Expected output for 'h5diff file3.h5 file3.h5 -v link link' ############################# -$h5diff file3.h5 file3.h5 link link -Comparison not supported -</link> is of type H5G_LINK and </link> is of type H5G_LINK - +$h5diff file3.h5 file3.h5 -v link link +Link: </link> and </link> diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index 3b0bdb8..7a9866e 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -1,17 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset0a dset0b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset0a dset0b' ############################# -$h5diff file6.h5 file6.h5 dset0a dset0b -Warning: Different storage datatype -</dset0a> has file datatype H5T_STD_I16LE -</dset0b> has file datatype H5T_STD_I32LE -Comparing </dset0a> with </dset0b> -position dset0a dset0b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset0a dset0b +Object <dset0a> could not be found in <file4.h5> +Object <dset0b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index a8de11e..6e3f3de 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset1a dset1b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset1a dset1b' ############################# -$h5diff file6.h5 file6.h5 dset1a dset1b -Comparing </dset1a> with </dset1b> -position dset1a dset1b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset1a dset1b +Object <dset1a> could not be found in <file4.h5> +Object <dset1b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 5d0d0a0..c235f43 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset2a dset2b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset2a dset2b' ############################# -$h5diff file6.h5 file6.h5 dset2a dset2b -Comparing </dset2a> with </dset2b> -position dset2a dset2b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset2a dset2b +Object <dset2a> could not be found in <file4.h5> +Object <dset2b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 4d6e3b7..eab744d 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset3a dset4b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b' ############################# -$h5diff file6.h5 file6.h5 dset3a dset4b -Comparing </dset3a> with </dset4b> -position dset3a dset4b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset3a dset4b +Object <dset3a> could not be found in <file4.h5> +Object <dset4b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 968d483..23397aa 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset4a dset4b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset4a dset4b' ############################# -$h5diff file6.h5 file6.h5 dset4a dset4b -Comparing </dset4a> with </dset4b> -position dset4a dset4b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset4a dset4b +Object <dset4a> could not be found in <file4.h5> +Object <dset4b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index 40fa20a..0f397c9 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset5a dset5b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset5a dset5b' ############################# -$h5diff file6.h5 file6.h5 dset5a dset5b -Comparing </dset5a> with </dset5b> -position dset5a dset5b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset5a dset5b +Object <dset5a> could not be found in <file4.h5> +Object <dset5b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 6075593..59fd5a2 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -1,14 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset6a dset6b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset6a dset6b' ############################# -$h5diff file6.h5 file6.h5 dset6a dset6b -Comparing </dset6a> with </dset6b> -position dset6a dset6b difference ------------------------------------------------------------- -[ 1 0 ] 1 3 2 -[ 1 1 ] 1 4 3 -[ 2 0 ] 1 5 4 -[ 2 1 ] 1 6 5 -4 differences found - +$h5diff file4.h5 file4.h5 -v dset6a dset6b +Object <dset6a> could not be found in <file4.h5> +Object <dset6b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index 783621b..308eae0 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -1,11 +1,7 @@ ############################# -Expected output for 'h5diff file6.h5 file6.h5 dset7a dset7b' +Expected output for 'h5diff file4.h5 file4.h5 -v dset7a dset7b' ############################# -$h5diff file6.h5 file6.h5 dset7a dset7b -Warning: Different storage datatype -</dset7a> has file datatype H5T_STD_I8LE -</dset7b> has file datatype H5T_STD_U8LE -Comparison not supported -</dset7a> has sign H5T_SGN_2 -</dset7b> has sign H5T_SGN_NONE +$h5diff file4.h5 file4.h5 -v dset7a dset7b +Object <dset7a> could not be found in <file4.h5> +Object <dset7b> could not be found in <file4.h5> diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt index 5c85fa5..50254b0 100644 --- a/tools/testfiles/h5diff_600.txt +++ b/tools/testfiles/h5diff_600.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5' ############################# -$h5diff file1.h5 Number of arguments is only 2 Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_601.txt b/tools/testfiles/h5diff_601.txt index e580166..2896b76 100644 --- a/tools/testfiles/h5diff_601.txt +++ b/tools/testfiles/h5diff_601.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -x' ############################# -$h5diff file1.h5 file2.h5 -x -x is an invalid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt index 1b4e124..160b9e9b 100644 --- a/tools/testfiles/h5diff_602.txt +++ b/tools/testfiles/h5diff_602.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d g1/dset3 g1/dset4 <-d g1/dset3> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt index 32fd29b..5630fd6 100644 --- a/tools/testfiles/h5diff_603.txt +++ b/tools/testfiles/h5diff_603.txt @@ -1,8 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d -4 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d -4 g1/dset3 g1/dset4 -<-d -4> is not a valid option +Not a valid -d option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] file1 File name of the first HDF5 file @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt index 23ac58c..58f3259 100644 --- a/tools/testfiles/h5diff_604.txt +++ b/tools/testfiles/h5diff_604.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 0 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 0 g1/dset3 g1/dset4 <-d 0> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt index 31f9ee3..bef85ea 100644 --- a/tools/testfiles/h5diff_605.txt +++ b/tools/testfiles/h5diff_605.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d u g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d u g1/dset3 g1/dset4 <-d u> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt index e62baf2..fe5308c 100644 --- a/tools/testfiles/h5diff_606.txt +++ b/tools/testfiles/h5diff_606.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4 <-d 0x1> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt index 0cdd240..01cf531 100644 --- a/tools/testfiles/h5diff_607.txt +++ b/tools/testfiles/h5diff_607.txt @@ -1,16 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -[ 1 1 ] 100 80 20 -[ 2 0 ] 100 140 40 -[ 2 1 ] 100 200 100 -6 differences found - - +[ 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 diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt index a93ba06..983f569 100644 --- a/tools/testfiles/h5diff_608.txt +++ b/tools/testfiles/h5diff_608.txt @@ -1,16 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -[ 1 1 ] 100 80 20 -[ 2 0 ] 100 140 40 -[ 2 1 ] 100 200 100 -6 differences found - - +[ 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 diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt index 4856c70..279122f 100644 --- a/tools/testfiles/h5diff_609.txt +++ b/tools/testfiles/h5diff_609.txt @@ -1,8 +1,3 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> -0 differences found - - diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt index 0cdd240..01cf531 100644 --- a/tools/testfiles/h5diff_610.txt +++ b/tools/testfiles/h5diff_610.txt @@ -1,16 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -[ 1 1 ] 100 80 20 -[ 2 0 ] 100 140 40 -[ 2 1 ] 100 200 100 -6 differences found - - +[ 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 diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt index a81b283..10dec8f 100644 --- a/tools/testfiles/h5diff_611.txt +++ b/tools/testfiles/h5diff_611.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p g1/dset3 g1/dset4 <-p g1/dset3> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt index e41e95c..803b64e 100644 --- a/tools/testfiles/h5diff_612.txt +++ b/tools/testfiles/h5diff_612.txt @@ -1,8 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4 --4 is an invalid option +Not a valid -p option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] file1 File name of the first HDF5 file @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt index 2aefa0e..61e1d91 100644 --- a/tools/testfiles/h5diff_613.txt +++ b/tools/testfiles/h5diff_613.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4 <-p 0> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt index 659696c..a0a8b49 100644 --- a/tools/testfiles/h5diff_614.txt +++ b/tools/testfiles/h5diff_614.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p u g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p u g1/dset3 g1/dset4 <-p u> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt index ce3d4da..2f19008 100644 --- a/tools/testfiles/h5diff_615.txt +++ b/tools/testfiles/h5diff_615.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4 <-p 0x1> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt index 576a7a9..efaf8a3 100644 --- a/tools/testfiles/h5diff_616.txt +++ b/tools/testfiles/h5diff_616.txt @@ -1,12 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0.21 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference relative ------------------------------------------------------------------------ [ 2 0 ] 100 140 40 0.4 [ 2 1 ] 100 200 100 1 -2 differences found - - diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt index 1a2e58a..267c992 100644 --- a/tools/testfiles/h5diff_617.txt +++ b/tools/testfiles/h5diff_617.txt @@ -1,12 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference relative ------------------------------------------------------------------------ [ 2 0 ] 100 140 40 0.4 [ 2 1 ] 100 200 100 1 -2 differences found - - diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt index fc74bc0..78d3ca2 100644 --- a/tools/testfiles/h5diff_618.txt +++ b/tools/testfiles/h5diff_618.txt @@ -1,8 +1,3 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> -0 differences found - - diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt index 22b60084..8ef4136 100644 --- a/tools/testfiles/h5diff_619.txt +++ b/tools/testfiles/h5diff_619.txt @@ -1,8 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 110 10 0.1 @@ -11,6 +9,3 @@ position dset3 dset4 difference relative [ 1 1 ] 100 80 20 0.2 [ 2 0 ] 100 140 40 0.4 [ 2 1 ] 100 200 100 1 -6 differences found - - diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt index 471403a..2d01f76de 100644 --- a/tools/testfiles/h5diff_620.txt +++ b/tools/testfiles/h5diff_620.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n g1/dset3 g1/dset4 <-n g1/dset3> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt index 0ce65ba..11a3e16 100644 --- a/tools/testfiles/h5diff_621.txt +++ b/tools/testfiles/h5diff_621.txt @@ -1,8 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4 --4 is an invalid option +Not a valid -n option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] file1 File name of the first HDF5 file @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt index ded2aa0..5d082eb 100644 --- a/tools/testfiles/h5diff_622.txt +++ b/tools/testfiles/h5diff_622.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4 <-n 0> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt index ed80d2a..6bfe66b 100644 --- a/tools/testfiles/h5diff_623.txt +++ b/tools/testfiles/h5diff_623.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n u g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n u g1/dset3 g1/dset4 <-n u> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt index 1cbd883..9feda50 100644 --- a/tools/testfiles/h5diff_624.txt +++ b/tools/testfiles/h5diff_624.txt @@ -1,7 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4 <-n 0x1> is not a valid option Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] @@ -11,6 +10,7 @@ file2 File name of the second HDF5 file [obj2] Name of an HDF5 object, in absolute path [OPTIONS] are: [-h] Print out this information +[-v] Verbose mode [-r] Print only what objects differ, not the differences [-n count] Print difference up to count number [-d delta] Print difference when it is greater than limit delta diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt index d2684d3..780131f 100644 --- a/tools/testfiles/h5diff_625.txt +++ b/tools/testfiles/h5diff_625.txt @@ -1,12 +1,7 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 2 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 2 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -2 differences found - - +[ 0 0 ] 100.000000 110.000000 10.000000 +[ 0 1 ] 110.000000 100.000000 10.000000 diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt index a18e823..e1e38d6 100644 --- a/tools/testfiles/h5diff_626.txt +++ b/tools/testfiles/h5diff_626.txt @@ -1,13 +1,8 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -3 differences found - - +[ 0 0 ] 100.000000 110.000000 10.000000 +[ 0 1 ] 110.000000 100.000000 10.000000 +[ 1 0 ] 100.000000 90.000000 10.000000 diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt index b67afc5..30e6c50 100644 --- a/tools/testfiles/h5diff_627.txt +++ b/tools/testfiles/h5diff_627.txt @@ -1,16 +1,11 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -[ 0 1 ] 110 100 10 -[ 1 0 ] 100 90 10 -[ 1 1 ] 100 80 20 -[ 2 0 ] 100 140 40 -[ 2 1 ] 100 200 100 -6 differences found - - +[ 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 diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt index 891c3bb..008b4d3 100644 --- a/tools/testfiles/h5diff_628.txt +++ b/tools/testfiles/h5diff_628.txt @@ -1,11 +1,6 @@ ############################# Expected output for 'h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4' ############################# -$h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4 -Comparing </g1/dset3> with </g1/dset4> position dset3 dset4 difference ------------------------------------------------------------ -[ 0 0 ] 100 110 10 -1 differences found - - +[ 0 0 ] 100.000000 110.000000 10.000000 diff --git a/tools/testfiles/h5diff_629.txt b/tools/testfiles/h5diff_629.txt index 51a825f..8d7ced3 100644 --- a/tools/testfiles/h5diff_629.txt +++ b/tools/testfiles/h5diff_629.txt @@ -1,5 +1,5 @@ ############################# Expected output for 'h5diff file1.h6 file2.h6' ############################# -$h5diff file1.h6 file2.h6 -h5diff: file1.h6: No such file or directory +h5diff: <file1.h6>: unable to open file +h5diff: <file2.h6>: unable to open file diff --git a/tools/testfiles/test1.h5 b/tools/testfiles/test1.h5 Binary files differindex 54c897a..fa70b7e 100644 --- a/tools/testfiles/test1.h5 +++ b/tools/testfiles/test1.h5 diff --git a/tools/testfiles/test3.h5 b/tools/testfiles/test3.h5 Binary files differindex 36a3aa4..f48d367 100644 --- a/tools/testfiles/test3.h5 +++ b/tools/testfiles/test3.h5 diff --git a/tools/testfiles/test4.h5 b/tools/testfiles/test4.h5 Binary files differindex ce2cfee..7e1e16a 100644 --- a/tools/testfiles/test4.h5 +++ b/tools/testfiles/test4.h5 |