summaryrefslogtreecommitdiffstats
path: root/tools/h5copy
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2010-09-16 18:09:59 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2010-09-16 18:09:59 (GMT)
commita9a3f22e786983ec4e946bd1a8cdd42ec8058c53 (patch)
treed144bfe7cf780f925535a2466ce37059e6917123 /tools/h5copy
parent9f028ea4589cfd21ce610050c75895ed69b2ee08 (diff)
downloadhdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.zip
hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.gz
hdf5-a9a3f22e786983ec4e946bd1a8cdd42ec8058c53.tar.bz2
[svn-r19401] Purpose:
Fix for Bug1975 h5diff - support recursive comparison on group when specified as an object Description: Merged from hdf5 trunk (r19400). 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
Diffstat (limited to 'tools/h5copy')
-rw-r--r--tools/h5copy/h5copy.c2
-rw-r--r--tools/h5copy/testh5copy.sh8
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