diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-05-07 22:28:09 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-05-07 22:28:09 (GMT) |
| commit | 401c1bc31813f5b44d575823a2c28175bb4e86a0 (patch) | |
| tree | 6437baab4e6474b4585ea5f10bac3b801a800104 /tools/testfiles | |
| parent | 1c37e0ba3d2707b10595616f4cf5324791550f3e (diff) | |
| download | hdf5-401c1bc31813f5b44d575823a2c28175bb4e86a0.zip hdf5-401c1bc31813f5b44d575823a2c28175bb4e86a0.tar.gz hdf5-401c1bc31813f5b44d575823a2c28175bb4e86a0.tar.bz2 | |
[svn-r6827] Purpose:
added new test files for h5diff
bug fix
Description:
the criteria for determining the correct switch case cast to void* to type* was the data size read from disk.
this was causing problems on Cray T3E, where all integer except char are 8 bytes long
Solution:
changed the criteria for using the memory size instead, which is determined by the same function
that reads the data into memory
the messages " using memory NATIVE_TYPE_X" were removed, because they might not coincid on different
platforms.
Platforms tested:
Linux 2.4 (rockaway)
SunOS 5.7 (arabica)
IRIX 6.5 (modi4)
Misc. update:
Diffstat (limited to 'tools/testfiles')
68 files changed, 82 insertions, 67 deletions
diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt index 84dce54..919a6f1 100644 --- a/tools/testfiles/h5diff_01.txt +++ b/tools/testfiles/h5diff_01.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_02.txt b/tools/testfiles/h5diff_02.txt index 3dab1ef..738c8b9 100644 --- a/tools/testfiles/h5diff_02.txt +++ b/tools/testfiles/h5diff_02.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_031.txt b/tools/testfiles/h5diff_031.txt index 789fe25..348bfbb 100644 --- a/tools/testfiles/h5diff_031.txt +++ b/tools/testfiles/h5diff_031.txt @@ -14,4 +14,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_041.txt b/tools/testfiles/h5diff_041.txt index 806f9c5..2e0203e 100644 --- a/tools/testfiles/h5diff_041.txt +++ b/tools/testfiles/h5diff_041.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_0410.txt b/tools/testfiles/h5diff_0410.txt index ff1059a..aa828f3 100644 --- a/tools/testfiles/h5diff_0410.txt +++ b/tools/testfiles/h5diff_0410.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -d 2.3 h5diff_test1.h5 h5diff_test ############################# $h5diff dset2.1a dset2.1b -d 2.3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 1 ] 1 4 3 diff --git a/tools/testfiles/h5diff_042.txt b/tools/testfiles/h5diff_042.txt index de5e713..8e9fa42 100644 --- a/tools/testfiles/h5diff_042.txt +++ b/tools/testfiles/h5diff_042.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_043.txt b/tools/testfiles/h5diff_043.txt index 748f7a0..59ab375 100644 --- a/tools/testfiles/h5diff_043.txt +++ b/tools/testfiles/h5diff_043.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_044.txt b/tools/testfiles/h5diff_044.txt index b034418..0ac488b 100644 --- a/tools/testfiles/h5diff_044.txt +++ b/tools/testfiles/h5diff_044.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_045.txt b/tools/testfiles/h5diff_045.txt index 169a908..1452776 100644 --- a/tools/testfiles/h5diff_045.txt +++ b/tools/testfiles/h5diff_045.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_048.txt b/tools/testfiles/h5diff_048.txt index 649f9d9..4d656db 100644 --- a/tools/testfiles/h5diff_048.txt +++ b/tools/testfiles/h5diff_048.txt @@ -3,6 +3,5 @@ Expected output for 'h5diff dset2.1a dset2.1b -d 7 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -d 7 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR 0 differences found diff --git a/tools/testfiles/h5diff_049.txt b/tools/testfiles/h5diff_049.txt index a5ecf15..02f729f 100644 --- a/tools/testfiles/h5diff_049.txt +++ b/tools/testfiles/h5diff_049.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -d 1 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -d 1 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_051.txt b/tools/testfiles/h5diff_051.txt index 3bba57b..2c7ee52 100644 --- a/tools/testfiles/h5diff_051.txt +++ b/tools/testfiles/h5diff_051.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_0510.txt b/tools/testfiles/h5diff_0510.txt index 0a69cb9..26ca338 100644 --- a/tools/testfiles/h5diff_0510.txt +++ b/tools/testfiles/h5diff_0510.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -p 2.3 h5diff_test1.h5 h5diff_test ############################# $h5diff dset2.1a dset2.1b -p 2.3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 1 ] 1 4 3 diff --git a/tools/testfiles/h5diff_052.txt b/tools/testfiles/h5diff_052.txt index 5b44166..98e6f66 100644 --- a/tools/testfiles/h5diff_052.txt +++ b/tools/testfiles/h5diff_052.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_053.txt b/tools/testfiles/h5diff_053.txt index a51d0b3..07b10f6 100644 --- a/tools/testfiles/h5diff_053.txt +++ b/tools/testfiles/h5diff_053.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_054.txt b/tools/testfiles/h5diff_054.txt index 96129ce..44ef2c1 100644 --- a/tools/testfiles/h5diff_054.txt +++ b/tools/testfiles/h5diff_054.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_055.txt b/tools/testfiles/h5diff_055.txt index 18e3890..6ba293f 100644 --- a/tools/testfiles/h5diff_055.txt +++ b/tools/testfiles/h5diff_055.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_058.txt b/tools/testfiles/h5diff_058.txt index 0d29875..be2dc79 100644 --- a/tools/testfiles/h5diff_058.txt +++ b/tools/testfiles/h5diff_058.txt @@ -3,6 +3,5 @@ Expected output for 'h5diff dset2.1a dset2.1b -p 7 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -p 7 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR 0 differences found diff --git a/tools/testfiles/h5diff_059.txt b/tools/testfiles/h5diff_059.txt index 7f4c6de..2117daf 100644 --- a/tools/testfiles/h5diff_059.txt +++ b/tools/testfiles/h5diff_059.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -p 1 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -p 1 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_061.txt b/tools/testfiles/h5diff_061.txt index a8ed80a..30d5fc0 100644 --- a/tools/testfiles/h5diff_061.txt +++ b/tools/testfiles/h5diff_061.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_0610.txt b/tools/testfiles/h5diff_0610.txt index 43ac12e..0cde0ff 100644 --- a/tools/testfiles/h5diff_0610.txt +++ b/tools/testfiles/h5diff_0610.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_062.txt b/tools/testfiles/h5diff_062.txt index 5d49586..30b7af7 100644 --- a/tools/testfiles/h5diff_062.txt +++ b/tools/testfiles/h5diff_062.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_063.txt b/tools/testfiles/h5diff_063.txt index e9cd333..cbeb3ae 100644 --- a/tools/testfiles/h5diff_063.txt +++ b/tools/testfiles/h5diff_063.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_064.txt b/tools/testfiles/h5diff_064.txt index 0386311..22bf824 100644 --- a/tools/testfiles/h5diff_064.txt +++ b/tools/testfiles/h5diff_064.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_065.txt b/tools/testfiles/h5diff_065.txt index 2f0eb34..b9d01d1 100644 --- a/tools/testfiles/h5diff_065.txt +++ b/tools/testfiles/h5diff_065.txt @@ -15,4 +15,4 @@ file2_name File name of the second HDF5 file [-n count] Print difference up to count number for each variable [-d delta] Print difference when it is greater than limit delta [-p relative] Print differences which are within a relative error value -[-m ] Print differences on a sequencial match iteration +[-m ] Print differences on a sequential match iteration diff --git a/tools/testfiles/h5diff_068.txt b/tools/testfiles/h5diff_068.txt index 031ce8a..5066e46 100644 --- a/tools/testfiles/h5diff_068.txt +++ b/tools/testfiles/h5diff_068.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -n 7 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -n 7 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_069.txt b/tools/testfiles/h5diff_069.txt index c12bc41..2e8c61d 100644 --- a/tools/testfiles/h5diff_069.txt +++ b/tools/testfiles/h5diff_069.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -n 1 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -n 1 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 7295ef6..301ebb6 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -6,6 +6,5 @@ Comparing <dset1.7> with <dset1.7> Warning: <dset1.7> has different maximum dimensions than <dset1.7> <dset1.7>: [ 7 ] <dset1.7>: [ 8 ] -using memory type H5T_NATIVE_INT 0 differences found diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt index e6c625b..d5f583a 100644 --- a/tools/testfiles/h5diff_18.txt +++ b/tools/testfiles/h5diff_18.txt @@ -5,6 +5,5 @@ $h5diff dset1.8 dset1.8 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset1.8> with <dset1.8> Warning: <dset1.8> has different storage datatype than <dset1.8> <dset1.8> has datatype H5T_STD_I32BE and <dset1.8> has datatype H5T_STD_I32LE -using memory type H5T_NATIVE_INT 0 differences found diff --git a/tools/testfiles/h5diff_213.txt b/tools/testfiles/h5diff_213.txt index 312ee87..ae8dc09 100644 --- a/tools/testfiles/h5diff_213.txt +++ b/tools/testfiles/h5diff_213.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.1a dset2.1b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.1a dset2.1b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.1a> with <dset2.1b> -using memory type H5T_NATIVE_SCHAR position dset2.1a dset2.1b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_220.txt b/tools/testfiles/h5diff_220.txt index 688fcee..7ceddec 100644 --- a/tools/testfiles/h5diff_220.txt +++ b/tools/testfiles/h5diff_220.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.2a dset2.2b h5diff_test1.h5 h5diff_test2.h5' ############################# $h5diff dset2.2a dset2.2b h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.2a> with <dset2.2b> -using memory type H5T_NATIVE_SHORT position dset2.2a dset2.2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_221.txt b/tools/testfiles/h5diff_221.txt index 9ca4b5c..e1a569c 100644 --- a/tools/testfiles/h5diff_221.txt +++ b/tools/testfiles/h5diff_221.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.2a dset2.2b -n 2 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.2a dset2.2b -n 2 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.2a> with <dset2.2b> -using memory type H5T_NATIVE_SHORT position dset2.2a dset2.2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_222.txt b/tools/testfiles/h5diff_222.txt index 91992c8..cd16fb1 100644 --- a/tools/testfiles/h5diff_222.txt +++ b/tools/testfiles/h5diff_222.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.2a dset2.2b -d 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.2a dset2.2b -d 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.2a> with <dset2.2b> -using memory type H5T_NATIVE_SHORT position dset2.2a dset2.2b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_223.txt b/tools/testfiles/h5diff_223.txt index 17514f4..d25e995 100644 --- a/tools/testfiles/h5diff_223.txt +++ b/tools/testfiles/h5diff_223.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.2a dset2.2b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.2a dset2.2b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.2a> with <dset2.2b> -using memory type H5T_NATIVE_SHORT position dset2.2a dset2.2b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_230.txt b/tools/testfiles/h5diff_230.txt index bdfc40e..ba72590 100644 --- a/tools/testfiles/h5diff_230.txt +++ b/tools/testfiles/h5diff_230.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.3a dset2.3b h5diff_test1.h5 h5diff_test2.h5' ############################# $h5diff dset2.3a dset2.3b h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.3a> with <dset2.3b> -using memory type H5T_NATIVE_INT position dset2.3a dset2.3b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_231.txt b/tools/testfiles/h5diff_231.txt index 5bc4a08..e6684f3 100644 --- a/tools/testfiles/h5diff_231.txt +++ b/tools/testfiles/h5diff_231.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.3a dset2.3b -n 2 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.3a dset2.3b -n 2 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.3a> with <dset2.3b> -using memory type H5T_NATIVE_INT position dset2.3a dset2.3b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_232.txt b/tools/testfiles/h5diff_232.txt index c6222c4..c3474ea 100644 --- a/tools/testfiles/h5diff_232.txt +++ b/tools/testfiles/h5diff_232.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.3a dset2.3b -d 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.3a dset2.3b -d 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.3a> with <dset2.3b> -using memory type H5T_NATIVE_INT position dset2.3a dset2.3b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_233.txt b/tools/testfiles/h5diff_233.txt index e580cb5..89ee3d9 100644 --- a/tools/testfiles/h5diff_233.txt +++ b/tools/testfiles/h5diff_233.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.3a dset2.3b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.3a dset2.3b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.3a> with <dset2.3b> -using memory type H5T_NATIVE_INT position dset2.3a dset2.3b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_240.txt b/tools/testfiles/h5diff_240.txt index c86aee7..db12b4b 100644 --- a/tools/testfiles/h5diff_240.txt +++ b/tools/testfiles/h5diff_240.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.4a dset2.4b h5diff_test1.h5 h5diff_test2.h5' ############################# $h5diff dset2.4a dset2.4b h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.4a> with <dset2.4b> -using memory type H5T_NATIVE_INT position dset2.4a dset2.4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_241.txt b/tools/testfiles/h5diff_241.txt index f95fb81..4d21e96 100644 --- a/tools/testfiles/h5diff_241.txt +++ b/tools/testfiles/h5diff_241.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.4a dset2.4b -n 2 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.4a dset2.4b -n 2 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.4a> with <dset2.4b> -using memory type H5T_NATIVE_INT position dset2.4a dset2.4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_242.txt b/tools/testfiles/h5diff_242.txt index 32da751..42da6c5 100644 --- a/tools/testfiles/h5diff_242.txt +++ b/tools/testfiles/h5diff_242.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.4a dset2.4b -d 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.4a dset2.4b -d 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.4a> with <dset2.4b> -using memory type H5T_NATIVE_INT position dset2.4a dset2.4b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_243.txt b/tools/testfiles/h5diff_243.txt index 03a583d..9fc2f6c 100644 --- a/tools/testfiles/h5diff_243.txt +++ b/tools/testfiles/h5diff_243.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.4a dset2.4b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.4a dset2.4b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.4a> with <dset2.4b> -using memory type H5T_NATIVE_INT position dset2.4a dset2.4b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_250.txt b/tools/testfiles/h5diff_250.txt index 67efcac..16eda07 100644 --- a/tools/testfiles/h5diff_250.txt +++ b/tools/testfiles/h5diff_250.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.5a dset2.5b h5diff_test1.h5 h5diff_test2.h5' ############################# $h5diff dset2.5a dset2.5b h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.5a> with <dset2.5b> -using memory type H5T_NATIVE_FLOAT position dset2.5a dset2.5b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_251.txt b/tools/testfiles/h5diff_251.txt index 35a75ed..6e26192 100644 --- a/tools/testfiles/h5diff_251.txt +++ b/tools/testfiles/h5diff_251.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.5a dset2.5b -n 2 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.5a dset2.5b -n 2 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.5a> with <dset2.5b> -using memory type H5T_NATIVE_FLOAT position dset2.5a dset2.5b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_252.txt b/tools/testfiles/h5diff_252.txt index 2fd68b2..7d76fc2 100644 --- a/tools/testfiles/h5diff_252.txt +++ b/tools/testfiles/h5diff_252.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.5a dset2.5b -d 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.5a dset2.5b -d 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.5a> with <dset2.5b> -using memory type H5T_NATIVE_FLOAT position dset2.5a dset2.5b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_253.txt b/tools/testfiles/h5diff_253.txt index 6893d67..6a1255f 100644 --- a/tools/testfiles/h5diff_253.txt +++ b/tools/testfiles/h5diff_253.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.5a dset2.5b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.5a dset2.5b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.5a> with <dset2.5b> -using memory type H5T_NATIVE_FLOAT position dset2.5a dset2.5b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_260.txt b/tools/testfiles/h5diff_260.txt index f8bfb34..ecb10a0 100644 --- a/tools/testfiles/h5diff_260.txt +++ b/tools/testfiles/h5diff_260.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.6a dset2.6b h5diff_test1.h5 h5diff_test2.h5' ############################# $h5diff dset2.6a dset2.6b h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.6a> with <dset2.6b> -using memory type H5T_NATIVE_DOUBLE position dset2.6a dset2.6b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_261.txt b/tools/testfiles/h5diff_261.txt index 6102ff3..d06ab90 100644 --- a/tools/testfiles/h5diff_261.txt +++ b/tools/testfiles/h5diff_261.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.6a dset2.6b -n 2 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.6a dset2.6b -n 2 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.6a> with <dset2.6b> -using memory type H5T_NATIVE_DOUBLE position dset2.6a dset2.6b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_262.txt b/tools/testfiles/h5diff_262.txt index fc4b159..ba8ad24 100644 --- a/tools/testfiles/h5diff_262.txt +++ b/tools/testfiles/h5diff_262.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.6a dset2.6b -d 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.6a dset2.6b -d 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.6a> with <dset2.6b> -using memory type H5T_NATIVE_DOUBLE position dset2.6a dset2.6b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_263.txt b/tools/testfiles/h5diff_263.txt index 7df596d..0449655 100644 --- a/tools/testfiles/h5diff_263.txt +++ b/tools/testfiles/h5diff_263.txt @@ -3,7 +3,6 @@ Expected output for 'h5diff dset2.6a dset2.6b -p 3 h5diff_test1.h5 h5diff_test2. ############################# $h5diff dset2.6a dset2.6b -p 3 h5diff_test1.h5 h5diff_test2.h5 Comparing <dset2.6a> with <dset2.6b> -using memory type H5T_NATIVE_DOUBLE position dset2.6a dset2.6b difference ------------------------------------------------------------ [ 2 0 ] 1 5 4 diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt index 03d6887..9855851 100644 --- a/tools/testfiles/h5diff_30.txt +++ b/tools/testfiles/h5diff_30.txt @@ -2,7 +2,7 @@ Expected output for 'h5diff h5diff_test3.h5 h5diff_test4.h5' ############################# $h5diff h5diff_test3.h5 h5diff_test4.h5 -</dset3> found in <h5diff_test3.h5> and </dset3> found in <h5diff_test4.h5> -</dset4> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5> -</dset5> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5> +</dset_A> found in <h5diff_test3.h5> and </dset_A> found in <h5diff_test4.h5> +</dset_B> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5> +</dset_C> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5> diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt index a4d73d7..5b2d5a6 100644 --- a/tools/testfiles/h5diff_31.txt +++ b/tools/testfiles/h5diff_31.txt @@ -1,8 +1,7 @@ ############################# -Expected output for 'h5diff dset3 dset3 h5diff_test3.h5 h5diff_test4.h5' +Expected output for 'h5diff dset_A dset_A h5diff_test3.h5 h5diff_test4.h5' ############################# -$h5diff dset3 dset3 h5diff_test3.h5 h5diff_test4.h5 -Comparing <dset3> with <dset3> -using memory type H5T_NATIVE_INT +$h5diff dset_A dset_A h5diff_test3.h5 h5diff_test4.h5 +Comparing <dset_A> with <dset_A> 0 differences found diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt index cedce16..1bea572 100644 --- a/tools/testfiles/h5diff_32.txt +++ b/tools/testfiles/h5diff_32.txt @@ -1,6 +1,6 @@ ############################# -Expected output for 'h5diff dset3 dset4 h5diff_test3.h5 h5diff_test4.h5' +Expected output for 'h5diff dset_A dset_B h5diff_test3.h5 h5diff_test4.h5' ############################# -$h5diff dset3 dset4 h5diff_test3.h5 h5diff_test4.h5 -Object <dset4> could not be found in <h5diff_test4.h5> +$h5diff dset_A dset_B h5diff_test3.h5 h5diff_test4.h5 +Object <dset_B> could not be found in <h5diff_test4.h5> diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt index 94587ae..fd247ad 100644 --- a/tools/testfiles/h5diff_33.txt +++ b/tools/testfiles/h5diff_33.txt @@ -1,6 +1,6 @@ ############################# -Expected output for 'h5diff dset6 dset3 h5diff_test3.h5 h5diff_test4.h5' +Expected output for 'h5diff dset_C dset_A h5diff_test3.h5 h5diff_test4.h5' ############################# -$h5diff dset6 dset3 h5diff_test3.h5 h5diff_test4.h5 -Object <dset6> could not be found in <h5diff_test3.h5> +$h5diff dset_C dset_A h5diff_test3.h5 h5diff_test4.h5 +Object <dset_C> could not be found in <h5diff_test3.h5> diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt index 704896b..84c1db6 100644 --- a/tools/testfiles/h5diff_34.txt +++ b/tools/testfiles/h5diff_34.txt @@ -1,7 +1,6 @@ ############################# -Expected output for 'h5diff dset6 dset6 h5diff_test3.h5 h5diff_test4.h5' +Expected output for 'h5diff dset_C dset_C h5diff_test3.h5 h5diff_test4.h5' ############################# -$h5diff dset6 dset6 h5diff_test3.h5 h5diff_test4.h5 -Object <dset6> could not be found in <h5diff_test3.h5> -Object <dset6> could not be found in <h5diff_test4.h5> +$h5diff dset_C dset_C h5diff_test3.h5 h5diff_test4.h5 +Object <dset_C> could not be found in <h5diff_test3.h5> diff --git a/tools/testfiles/h5diff_35.txt b/tools/testfiles/h5diff_35.txt new file mode 100644 index 0000000..38f3b01 --- /dev/null +++ b/tools/testfiles/h5diff_35.txt @@ -0,0 +1,8 @@ +############################# +Expected output for 'h5diff h5diff_test4.h5 h5diff_test3.h5' +############################# +$h5diff h5diff_test4.h5 h5diff_test3.h5 +</dset_A> found in <h5diff_test4.h5> and </dset_A> found in <h5diff_test3.h5> +</dset_B> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5> +</dset_C> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5> + diff --git a/tools/testfiles/h5diff_40.txt b/tools/testfiles/h5diff_40.txt new file mode 100644 index 0000000..cc4be28 --- /dev/null +++ b/tools/testfiles/h5diff_40.txt @@ -0,0 +1,7 @@ +############################# +Expected output for 'h5diff g1/dset1 g2/dset1 h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff g1/dset1 g2/dset1 h5diff_test5.h5 h5diff_test6.h5 +Comparing <g1/dset1> with <g2/dset1> +0 differences found + diff --git a/tools/testfiles/h5diff_411.txt b/tools/testfiles/h5diff_411.txt new file mode 100644 index 0000000..9b214d4 --- /dev/null +++ b/tools/testfiles/h5diff_411.txt @@ -0,0 +1,7 @@ +############################# +Expected output for 'h5diff dset1 dset1 h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff dset1 dset1 h5diff_test5.h5 h5diff_test6.h5 +Object <dset1> could not be found in <h5diff_test5.h5> +Object <dset1> could not be found in <h5diff_test6.h5> + diff --git a/tools/testfiles/h5diff_412.txt b/tools/testfiles/h5diff_412.txt new file mode 100644 index 0000000..09a1d62 --- /dev/null +++ b/tools/testfiles/h5diff_412.txt @@ -0,0 +1,6 @@ +############################# +Expected output for 'h5diff /g1/dset1 dset1 h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff /g1/dset1 dset1 h5diff_test5.h5 h5diff_test6.h5 +Object <dset1> could not be found in <h5diff_test6.h5> + diff --git a/tools/testfiles/h5diff_413.txt b/tools/testfiles/h5diff_413.txt new file mode 100644 index 0000000..cccdf93 --- /dev/null +++ b/tools/testfiles/h5diff_413.txt @@ -0,0 +1,6 @@ +############################# +Expected output for 'h5diff /g1/dset1 /g1/dset1 h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff /g1/dset1 /g1/dset1 h5diff_test5.h5 h5diff_test6.h5 +Object </g1/dset1> could not be found in <h5diff_test6.h5> + diff --git a/tools/testfiles/h5diff_421.txt b/tools/testfiles/h5diff_421.txt new file mode 100644 index 0000000..94a4258 --- /dev/null +++ b/tools/testfiles/h5diff_421.txt @@ -0,0 +1,7 @@ +############################# +Expected output for 'h5diff /a/b/c /a/b/c h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff /a/b/c /a/b/c h5diff_test5.h5 h5diff_test6.h5 +Comparing </a/b/c> with </a/b/c> +0 differences found + diff --git a/tools/testfiles/h5diff_422.txt b/tools/testfiles/h5diff_422.txt new file mode 100644 index 0000000..9b99466 --- /dev/null +++ b/tools/testfiles/h5diff_422.txt @@ -0,0 +1,7 @@ +############################# +Expected output for 'h5diff /x/a/c /a/b/c h5diff_test5.h5 h5diff_test6.h5' +############################# +$h5diff /x/a/c /a/b/c h5diff_test5.h5 h5diff_test6.h5 +Comparing </x/a/c> with </a/b/c> +0 differences found + diff --git a/tools/testfiles/h5diff_test1.h5 b/tools/testfiles/h5diff_test1.h5 Binary files differindex f4bb407..e5b1281 100644 --- a/tools/testfiles/h5diff_test1.h5 +++ b/tools/testfiles/h5diff_test1.h5 diff --git a/tools/testfiles/h5diff_test2.h5 b/tools/testfiles/h5diff_test2.h5 Binary files differindex 18a6648..30d05bd 100644 --- a/tools/testfiles/h5diff_test2.h5 +++ b/tools/testfiles/h5diff_test2.h5 diff --git a/tools/testfiles/h5diff_test3.h5 b/tools/testfiles/h5diff_test3.h5 Binary files differindex 3a08d67..ffeff7f 100644 --- a/tools/testfiles/h5diff_test3.h5 +++ b/tools/testfiles/h5diff_test3.h5 diff --git a/tools/testfiles/h5diff_test4.h5 b/tools/testfiles/h5diff_test4.h5 Binary files differindex 702c421..5777c98 100644 --- a/tools/testfiles/h5diff_test4.h5 +++ b/tools/testfiles/h5diff_test4.h5 diff --git a/tools/testfiles/h5diff_test5.h5 b/tools/testfiles/h5diff_test5.h5 Binary files differnew file mode 100644 index 0000000..74cfb19 --- /dev/null +++ b/tools/testfiles/h5diff_test5.h5 diff --git a/tools/testfiles/h5diff_test6.h5 b/tools/testfiles/h5diff_test6.h5 Binary files differnew file mode 100644 index 0000000..de0ec0f --- /dev/null +++ b/tools/testfiles/h5diff_test6.h5 |