diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-16 17:48:06 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-16 17:48:06 (GMT) |
| commit | c561dc7183a5496efdbccd25a0fb2b31b6d9772d (patch) | |
| tree | d3fdeac2e0dcbc3ee219fec262b1ecc091e70891 /tools/h5copy | |
| parent | 1914737e0658d642c1ef2e48c6162fa7cc400c64 (diff) | |
| download | hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.zip hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.gz hdf5-c561dc7183a5496efdbccd25a0fb2b31b6d9772d.tar.bz2 | |
[svn-r19400] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object
Description:
Compare member objects and groups recursively when two files or groups are specified to be compared. Support parallel diff and handling symbolic links accordingly.
Tested:
jam, amani, heiwa
Diffstat (limited to 'tools/h5copy')
| -rw-r--r-- | tools/h5copy/h5copy.c | 2 | ||||
| -rw-r--r-- | tools/h5copy/testh5copy.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c index d850f85..eb16754 100644 --- a/tools/h5copy/h5copy.c +++ b/tools/h5copy/h5copy.c @@ -416,7 +416,7 @@ main (int argc, const char *argv[]) if(verbose) linkinfo.opt.msg_mode = 1; - li_ret = H5tools_get_link_info(fid_src, oname_src, &linkinfo, 1); + li_ret = H5tools_get_symlink_info(fid_src, oname_src, &linkinfo, 1); if (li_ret == 0) /* dangling link */ { if(H5Lcopy(fid_src, oname_src, diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index e98e67e..a54816e 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -294,17 +294,17 @@ COPY_OBJECTS() TOOLTEST -i $TESTFILE -o $FILEOUT -v -s /grp_dsets/simple -d /grp_dsets/simple_group echo "Test copying & renaming group" - TOOLTEST_FAIL -i $TESTFILE -o $FILEOUT -v -s grp_dsets -d grp_rename + TOOLTEST -i $TESTFILE -o $FILEOUT -v -s grp_dsets -d grp_rename echo "Test copying 'full' group hierarchy into group in destination file" - TOOLTEST_FAIL -i $TESTFILE -o $FILEOUT -v -s grp_dsets -d /grp_rename/grp_dsets + TOOLTEST -i $TESTFILE -o $FILEOUT -v -s grp_dsets -d /grp_rename/grp_dsets echo "Test copying objects into group hier. that doesn't exist yet in destination file" TOOLTEST -i $TESTFILE -o $FILEOUT -vp -s simple -d /A/B1/simple TOOLTEST -i $TESTFILE -o $FILEOUT -vp -s simple -d /A/B2/simple2 TOOLTEST -i $TESTFILE -o $FILEOUT -vp -s /grp_dsets/simple -d /C/D/simple - TOOLTEST_FAIL -i $TESTFILE -o $FILEOUT -vp -s /grp_dsets -d /E/F/grp_dsets - TOOLTEST_FAIL -i $TESTFILE -o $FILEOUT -vp -s /grp_nested -d /G/H/grp_nested + TOOLTEST -i $TESTFILE -o $FILEOUT -vp -s /grp_dsets -d /E/F/grp_dsets + TOOLTEST -i $TESTFILE -o $FILEOUT -vp -s /grp_nested -d /G/H/grp_nested # Verify that the file created above is correct H5LSTEST $FILEOUT |