diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-05-19 18:39:20 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-05-19 18:39:20 (GMT) |
commit | c9eedcb82558673c9d22a1250a6054c18a3057fb (patch) | |
tree | a78208c9b77d5d6c312ed42f90403f90a72cf75b | |
parent | 303067fe0b9c640fb79354dfc6f6a57fe2c76817 (diff) | |
parent | a4a1a93e56d282611a800319cef8487a3449ab56 (diff) | |
download | hdf5-c9eedcb82558673c9d22a1250a6054c18a3057fb.zip hdf5-c9eedcb82558673c9d22a1250a6054c18a3057fb.tar.gz hdf5-c9eedcb82558673c9d22a1250a6054c18a3057fb.tar.bz2 |
Merge pull request #528 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'a4a1a93e56d282611a800319cef8487a3449ab56':
HDFFV-9055 Correct file generator
Added note about 9055 and 10128, 9995 not needed
-rw-r--r-- | release_docs/RELEASE.txt | 4 | ||||
-rw-r--r-- | tools/test/h5diff/h5diffgentest.c | 2 | ||||
-rw-r--r-- | tools/test/h5diff/testfiles/h5diff_58.txt | 2 | ||||
-rw-r--r-- | tools/test/h5diff/testfiles/h5diff_80.txt | 2 | ||||
-rw-r--r-- | tools/test/h5diff/testfiles/h5diff_dset1.h5 | bin | 23624 -> 23416 bytes | |||
-rw-r--r-- | tools/test/h5diff/testfiles/h5diff_dset2.h5 | bin | 23624 -> 23416 bytes | |||
-rw-r--r-- | tools/test/h5diff/testfiles/h5diff_dset3.h5 | bin | 23416 -> 23416 bytes |
7 files changed, 6 insertions, 4 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 81295e9..382420a 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -117,7 +117,9 @@ Bug Fixes since HDF5-1.10.0-patch1 release Tools ----- - - + - Improved h5diff compare of strings and arrays. + + (ADB, 2017/05/18, HDFFV-9055, HDFFV-10128) High-Level APIs: ------ diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c index 6a84365..708f371 100644 --- a/tools/test/h5diff/h5diffgentest.c +++ b/tools/test/h5diff/h5diffgentest.c @@ -7237,7 +7237,7 @@ void write_dset_in(hid_t loc_id, n=1; for (i = 0; i < 24; i++) { - for (j = 0; j < (int)dimarray[0]; j++) { + for (j = 0; j < 3; j++) { if (make_diffs) buf63[i][j]=0; else buf63[i][j]=n++; } diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/testfiles/h5diff_58.txt index 768dd97..d27a0c9 100644 --- a/tools/test/h5diff/testfiles/h5diff_58.txt +++ b/tools/test/h5diff/testfiles/h5diff_58.txt @@ -1,5 +1,5 @@ dataset: </refreg> and </refreg> -Referenced dataset 10720 10720 +Referenced dataset 10784 10784 ------------------------------------------------------------ Region blocks block #0 (2,2)-(7,7) (0,0)-(2,2) diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/testfiles/h5diff_80.txt index 5957d72..836e073 100644 --- a/tools/test/h5diff/testfiles/h5diff_80.txt +++ b/tools/test/h5diff/testfiles/h5diff_80.txt @@ -865,7 +865,7 @@ position vlen3D vlen3D difference [ 3 2 1 ] 59 0 59 59 differences found dataset: </refreg> and </refreg> -Referenced dataset 10720 10720 +Referenced dataset 10784 10784 ------------------------------------------------------------ Region blocks block #0 (2,2)-(7,7) (0,0)-(2,2) diff --git a/tools/test/h5diff/testfiles/h5diff_dset1.h5 b/tools/test/h5diff/testfiles/h5diff_dset1.h5 Binary files differindex 123e141..a587403 100644 --- a/tools/test/h5diff/testfiles/h5diff_dset1.h5 +++ b/tools/test/h5diff/testfiles/h5diff_dset1.h5 diff --git a/tools/test/h5diff/testfiles/h5diff_dset2.h5 b/tools/test/h5diff/testfiles/h5diff_dset2.h5 Binary files differindex 3ae6993..c38ed4a 100644 --- a/tools/test/h5diff/testfiles/h5diff_dset2.h5 +++ b/tools/test/h5diff/testfiles/h5diff_dset2.h5 diff --git a/tools/test/h5diff/testfiles/h5diff_dset3.h5 b/tools/test/h5diff/testfiles/h5diff_dset3.h5 Binary files differindex 65dd27d..4714d07 100644 --- a/tools/test/h5diff/testfiles/h5diff_dset3.h5 +++ b/tools/test/h5diff/testfiles/h5diff_dset3.h5 |