diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-05-02 20:41:03 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-05-02 20:41:03 (GMT) |
| commit | 3e755a079bb0bce16f80723ef8b4daf57d2ed979 (patch) | |
| tree | 21b33798b4ef25dbe932e84cb6a2b56b01de2da1 /windows | |
| parent | 216625cb8151eccb47bca4f9c6e19d7b85eb3c89 (diff) | |
| download | hdf5-3e755a079bb0bce16f80723ef8b4daf57d2ed979.zip hdf5-3e755a079bb0bce16f80723ef8b4daf57d2ed979.tar.gz hdf5-3e755a079bb0bce16f80723ef8b4daf57d2ed979.tar.bz2 | |
[svn-r20706] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Merged from HDF5 trunk r20676.
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index 9b73b60..4c19c3f 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -297,12 +297,12 @@ rem ############################################################################ call :tooltest h5diff_17.txt -v %file1% %file2%
rem 1.71 test 32-bit INFINITY
- call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp19
- call :tooltest h5diff_171.txt -v %file1% %file1% /g1/fp19
+ call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp19 /g1/fp19_COPY
+ call :tooltest h5diff_171.txt -v %file1% %file1% /g1/fp19 /g1/fp19_COPY
rem 1.72 test 64-bit INFINITY
- call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp20
- call :tooltest h5diff_172.txt -v %file1% %file1% /g1/fp20
+ call :testing %h5diff% -v %srcfile1% %srcfile1% /g1/fp20 /g1/fp20_COPY
+ call :tooltest h5diff_172.txt -v %file1% %file1% /g1/fp20 /g1/fp20_COPY
rem 1.8 quiet mode
call :testing %h5diff% -q %srcfile1% %srcfile2%
@@ -916,8 +916,8 @@ rem ############################################################################ rem ##############################################################################
rem # diff various multiple vlen and fixed strings in a compound type dataset
rem ##############################################################################
- call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs%
- call :tooltest h5diff_530.txt -v %comp_vl_strs% %comp_vl_strs%
+ call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs% /group /group_copy
+ call :tooltest h5diff_530.txt -v %comp_vl_strs% %comp_vl_strs% /group /group_copy
rem #######################################################################
|