diff options
Diffstat (limited to 'tools/testfiles')
61 files changed, 105 insertions, 82 deletions
diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt index 95913e2..6a45339 100644 --- a/tools/testfiles/h5diff_10.txt +++ b/tools/testfiles/h5diff_10.txt @@ -1,7 +1,7 @@ ############################# Expected output for 'h5diff -h' ############################# -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt index 5cf8868..82b42ce 100644 --- a/tools/testfiles/h5diff_100.txt +++ b/tools/testfiles/h5diff_100.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_hyper1.h5 h5diff_hyper2.h5 -v' +Expected output for 'h5diff -v h5diff_hyper1.h5 h5diff_hyper2.h5' ############################# file1 file2 diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt index e7c3d82..7affe59 100644 --- a/tools/testfiles/h5diff_101.txt +++ b/tools/testfiles/h5diff_101.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2 -v' +Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2' ############################# dataset: </g1/d1> and </g1/d2> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt index 475090c..dba340b 100644 --- a/tools/testfiles/h5diff_102.txt +++ b/tools/testfiles/h5diff_102.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2 -v' +Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2' ############################# dataset: </g1/fp1> and </g1/fp2> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 742b4b9..834f809 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r' +Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5' ############################# dataset: </g1/dset1> and </g1/dset1> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index 78e373a..d0f75b5 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dset2' +Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2' ############################# dataset: </g1/dset1> and </g1/dset2> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index fff7340..5f8e3d2 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g1/dset4' +Expected output for 'h5diff -r -d 5 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_16_1.txt b/tools/testfiles/h5diff_16_1.txt index b29d93c..738a0f7 100644 --- a/tools/testfiles/h5diff_16_1.txt +++ b/tools/testfiles/h5diff_16_1.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' +Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset5 g1/dset6' ############################# dataset: </g1/dset5> and </g1/dset6> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_16_2.txt b/tools/testfiles/h5diff_16_2.txt index 02bc972..49427a3 100644 --- a/tools/testfiles/h5diff_16_2.txt +++ b/tools/testfiles/h5diff_16_2.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' +Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset7 g1/dset8' ############################# dataset: </g1/dset7> and </g1/dset8> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_16_3.txt b/tools/testfiles/h5diff_16_3.txt index be5eb1e..0721799 100644 --- a/tools/testfiles/h5diff_16_3.txt +++ b/tools/testfiles/h5diff_16_3.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset9 g1/dset10' +Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10' ############################# dataset: </g1/dset9> and </g1/dset10> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index ec787b8..0f17c6d 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -v' +Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic2.h5' ############################# file1 file2 diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt index a37b889..24c2e32 100644 --- a/tools/testfiles/h5diff_18.txt +++ b/tools/testfiles/h5diff_18.txt @@ -1,3 +1,3 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -q' +Expected output for 'h5diff -q h5diff_basic1.h5 h5diff_basic2.h5' ############################# diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt index e4c1676..ebdcd9a 100644 --- a/tools/testfiles/h5diff_20.txt +++ b/tools/testfiles/h5diff_20.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v dset g1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset g1' ############################# Comparison not possible: </dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP -------------------------------- diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt index 0a41f0e..647b58d 100644 --- a/tools/testfiles/h5diff_21.txt +++ b/tools/testfiles/h5diff_21.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v dset l1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset l1' ############################# Comparison not possible: </dset> is of type H5G_DATASET and </l1> is of type H5G_LINK -------------------------------- diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt index a585ed2..b664837 100644 --- a/tools/testfiles/h5diff_22.txt +++ b/tools/testfiles/h5diff_22.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v dset t1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset t1' ############################# Comparison not possible: </dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE -------------------------------- diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt index 376e7c1..74c858a 100644 --- a/tools/testfiles/h5diff_23.txt +++ b/tools/testfiles/h5diff_23.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g1' ############################# group : </g1> and </g1> 0 differences found diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt index 3802d86..75f2e6f 100644 --- a/tools/testfiles/h5diff_24.txt +++ b/tools/testfiles/h5diff_24.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t1' ############################# datatype: </t1> and </t1> 0 differences found diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt index 6bfdbf4..8801c31 100644 --- a/tools/testfiles/h5diff_25.txt +++ b/tools/testfiles/h5diff_25.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l1' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l1' ############################# link : </l1> and </l1> 0 differences found diff --git a/tools/testfiles/h5diff_26.txt b/tools/testfiles/h5diff_26.txt index 544526b..24e1190 100644 --- a/tools/testfiles/h5diff_26.txt +++ b/tools/testfiles/h5diff_26.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g2' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g2' ############################# group : </g1> and </g2> 1 differences found diff --git a/tools/testfiles/h5diff_27.txt b/tools/testfiles/h5diff_27.txt index 3ba886c..f62e0e3 100644 --- a/tools/testfiles/h5diff_27.txt +++ b/tools/testfiles/h5diff_27.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t2' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t2' ############################# datatype: </t1> and </t2> 1 differences found diff --git a/tools/testfiles/h5diff_28.txt b/tools/testfiles/h5diff_28.txt index bbe6f00..4222159 100644 --- a/tools/testfiles/h5diff_28.txt +++ b/tools/testfiles/h5diff_28.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l2' +Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l2' ############################# link : </l1> and </l2> 1 differences found diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index 484fab9..d25dc1d 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset0a dset0b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset0a dset0b' ############################# dataset: </dset0a> and </dset0b> Warning: different storage datatype diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index b361bda..cf20b90 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset1a dset1b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset1a dset1b' ############################# dataset: </dset1a> and </dset1b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 59914fe..86e9463 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset2a dset2b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset2a dset2b' ############################# dataset: </dset2a> and </dset2b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 51c5c2c..2763fb3 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset3a dset4b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset3a dset4b' ############################# dataset: </dset3a> and </dset4b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 50ea51c..4c139de 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset4a dset4b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset4a dset4b' ############################# dataset: </dset4a> and </dset4b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index aaf8f21..2a1d496 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset5a dset5b' ############################# dataset: </dset5a> and </dset5b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index e31378e..245d1a0 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b' ############################# dataset: </dset6a> and </dset6b> size: [3x2] [3x2] diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt index dde8cc0..2b22995 100644 --- a/tools/testfiles/h5diff_57.txt +++ b/tools/testfiles/h5diff_57.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset7a dset7b' +Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b' ############################# dataset: </dset7a> and </dset7b> Warning: different storage datatype diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt index 4299ddb..38d3177 100644 --- a/tools/testfiles/h5diff_58.txt +++ b/tools/testfiles/h5diff_58.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dset1.h5 h5diff_dset2.h5 -v refreg' +Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 refreg' ############################# dataset: </refreg> and </refreg> Referenced dataset 5904 5904 diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt index 4ec69fb..a1bb063 100644 --- a/tools/testfiles/h5diff_600.txt +++ b/tools/testfiles/h5diff_600.txt @@ -1,7 +1,7 @@ ############################# Expected output for 'h5diff h5diff_basic1.h5' ############################# -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file @@ -51,3 +51,4 @@ Note) file1 and file2 can be the same file. Use to compare '/g1/dset1' and '/g1/dset2' in the same file If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value +h5diff error: missing file names diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt index 4e9f912..b9c2b8f6 100644 --- a/tools/testfiles/h5diff_602.txt +++ b/tools/testfiles/h5diff_602.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d g1/dset3 g1/dset4' +Expected output for 'h5diff -d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -<-d g1/dset3> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-d h5diff_basic1.h5> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt index 0deec30..efc8769 100644 --- a/tools/testfiles/h5diff_603.txt +++ b/tools/testfiles/h5diff_603.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d -4 g1/dset3 g1/dset4' +Expected output for 'h5diff -d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -Not a valid -d option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-d -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt index 9803ec7..7f0a2a6 100644 --- a/tools/testfiles/h5diff_604.txt +++ b/tools/testfiles/h5diff_604.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 0 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-d 0> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt index 533f4ec..5101c2d 100644 --- a/tools/testfiles/h5diff_605.txt +++ b/tools/testfiles/h5diff_605.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d u g1/dset3 g1/dset4' +Expected output for 'h5diff -d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-d u> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt index 08a97a0..9e32909 100644 --- a/tools/testfiles/h5diff_606.txt +++ b/tools/testfiles/h5diff_606.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 0x1 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-d 0x1> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt index ee999be..1a7c257 100644 --- a/tools/testfiles/h5diff_607.txt +++ b/tools/testfiles/h5diff_607.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt index 7d4f9c8..49b490e 100644 --- a/tools/testfiles/h5diff_608.txt +++ b/tools/testfiles/h5diff_608.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 -d 2 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 1 -d 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt index a0ccdd5..9a317f0 100644 --- a/tools/testfiles/h5diff_609.txt +++ b/tools/testfiles/h5diff_609.txt @@ -1,3 +1,3 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 200 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt index ee999be..1a7c257 100644 --- a/tools/testfiles/h5diff_610.txt +++ b/tools/testfiles/h5diff_610.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4' +Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt index 3369ce1..1d5e146 100644 --- a/tools/testfiles/h5diff_611.txt +++ b/tools/testfiles/h5diff_611.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -p g1/dset3 g1/dset4' +Expected output for 'h5diff -r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -<-p g1/dset3> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-p h5diff_basic1.h5> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt index ec7d9c8..47c36fb 100644 --- a/tools/testfiles/h5diff_612.txt +++ b/tools/testfiles/h5diff_612.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p -4 g1/dset3 g1/dset4' +Expected output for 'h5diff -p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -Not a valid -p option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-p -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt index b9a8790..056cbd6 100644 --- a/tools/testfiles/h5diff_613.txt +++ b/tools/testfiles/h5diff_613.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-p 0> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt index b4f742c..82db7f3 100644 --- a/tools/testfiles/h5diff_614.txt +++ b/tools/testfiles/h5diff_614.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p u g1/dset3 g1/dset4' +Expected output for 'h5diff -p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-p u> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt index 144abef..8ff33ac 100644 --- a/tools/testfiles/h5diff_615.txt +++ b/tools/testfiles/h5diff_615.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0x1 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-p 0x1> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt index 104e2ad..164aa15 100644 --- a/tools/testfiles/h5diff_616.txt +++ b/tools/testfiles/h5diff_616.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 0.21 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt index 9dd3bc7..3f0f078 100644 --- a/tools/testfiles/h5diff_617.txt +++ b/tools/testfiles/h5diff_617.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 0.21 -p 0.22 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt index a847a51..a1bb5a6 100644 --- a/tools/testfiles/h5diff_618.txt +++ b/tools/testfiles/h5diff_618.txt @@ -1,3 +1,3 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 2 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt index 3005978..f676315 100644 --- a/tools/testfiles/h5diff_619.txt +++ b/tools/testfiles/h5diff_619.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.005 g1/dset3 g1/dset4' +Expected output for 'h5diff -p 0.005 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt index cb12291..29110b9 100644 --- a/tools/testfiles/h5diff_620.txt +++ b/tools/testfiles/h5diff_620.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n g1/dset3 g1/dset4' +Expected output for 'h5diff -n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -<-n g1/dset3> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-n h5diff_basic1.h5> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt index e265a2c..ae7c644 100644 --- a/tools/testfiles/h5diff_621.txt +++ b/tools/testfiles/h5diff_621.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n -4 g1/dset3 g1/dset4' +Expected output for 'h5diff -n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# -Not a valid -n option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +<-n -4> is not a valid option +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt index c89b1ef..97cfda0 100644 --- a/tools/testfiles/h5diff_622.txt +++ b/tools/testfiles/h5diff_622.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 0 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-n 0> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt index 6dfeda7..9d2a914 100644 --- a/tools/testfiles/h5diff_623.txt +++ b/tools/testfiles/h5diff_623.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n u g1/dset3 g1/dset4' +Expected output for 'h5diff -n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-n u> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt index 4835b9e..7fc9cb1 100644 --- a/tools/testfiles/h5diff_624.txt +++ b/tools/testfiles/h5diff_624.txt @@ -1,8 +1,8 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 0x1 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# <-n 0x1> is not a valid option -usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] +usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file1 File name of the first HDF5 file file2 File name of the second HDF5 file diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt index 4de9a83..2da804c 100644 --- a/tools/testfiles/h5diff_625.txt +++ b/tools/testfiles/h5diff_625.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 2 differences found diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt index 3d481b7..2a5fd2f 100644 --- a/tools/testfiles/h5diff_626.txt +++ b/tools/testfiles/h5diff_626.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 -n 3 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 2 -n 3 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 3 differences found diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt index 4e422fe..06f34ba 100644 --- a/tools/testfiles/h5diff_627.txt +++ b/tools/testfiles/h5diff_627.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 200 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 6 differences found diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt index e24fb78..d6fa229 100644 --- a/tools/testfiles/h5diff_628.txt +++ b/tools/testfiles/h5diff_628.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 1 g1/dset3 g1/dset4' +Expected output for 'h5diff -n 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4' ############################# dataset: </g1/dset3> and </g1/dset4> 1 differences found diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index db01d50..fe3e03f 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_attr1.h5 h5diff_attr2.h5 -v' +Expected output for 'h5diff -v h5diff_attr1.h5 h5diff_attr2.h5' ############################# file1 file2 diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 0093870..90ee5c0 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5diff h5diff_dset1.h5 h5diff_dset2.h5 -v' +Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5' ############################# file1 file2 diff --git a/tools/testfiles/h5diff_90.txt b/tools/testfiles/h5diff_90.txt index 2b82d03..4df38c0 100644 --- a/tools/testfiles/h5diff_90.txt +++ b/tools/testfiles/h5diff_90.txt @@ -1,3 +1,25 @@ ############################# -Expected output for 'h5diff h5diff_basic2.h5 h5diff_basic2.h5' +Expected output for 'h5diff -v h5diff_basic2.h5 h5diff_basic2.h5' ############################# + +file1 file2 +--------------------------------------- + x x / + x x /g1 + x x /g1/dset1 + x x /g1/dset2 + x x /g1/dset4 + x x /g2 + +group : </> and </> +0 differences found +group : </g1> and </g1> +0 differences found +dataset: </g1/dset1> and </g1/dset1> +0 differences found +dataset: </g1/dset2> and </g1/dset2> +0 differences found +dataset: </g1/dset4> and </g1/dset4> +0 differences found +group : </g2> and </g2> +0 differences found |