diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2010-01-26 00:20:16 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-01-26 00:20:16 (GMT) |
| commit | 98639557acba114818e12f0c0954fabb94a61eeb (patch) | |
| tree | 013fade934be9ab849f2f695e8e0d2ed15b8f73f | |
| parent | 985a261886871d960213f3868520ab3583b8dafa (diff) | |
| download | hdf5-98639557acba114818e12f0c0954fabb94a61eeb.zip hdf5-98639557acba114818e12f0c0954fabb94a61eeb.tar.gz hdf5-98639557acba114818e12f0c0954fabb94a61eeb.tar.bz2 | |
[svn-r18166] Purpose:
Take care of test case fail for h5repack from checkin (r18164)
Description:
Previous checkin didn't allow h5diff to return succeed when a link's
target object doesn't exist. Changed it to succeed with warning.
(Need to discuss related feature)
Tested on Jam
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_400.txt | 11 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_417.txt | 8 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_418.txt | 8 | ||||
| -rw-r--r-- | tools/lib/h5diff.c | 3 |
4 files changed, 22 insertions, 8 deletions
diff --git a/tools/h5diff/testfiles/h5diff_400.txt b/tools/h5diff/testfiles/h5diff_400.txt index 4083941..4b910f5 100644 --- a/tools/h5diff/testfiles/h5diff_400.txt +++ b/tools/h5diff/testfiles/h5diff_400.txt @@ -35,8 +35,11 @@ link : </softlink_group2> and </softlink_group2> group : </target_group> and </target_group> 0 differences found 0 differences found -error: "/no_obj" doesn't exist -error: unable to get softlink info from "/softlink_noexist" +warn: link target "/no_obj" doesn't exist +warn: link target "/no_obj" doesn't exist +link : </softlink_noexist> and </softlink_noexist> +Comparison not supported: </no_obj> and </no_obj> are of type unknown type +0 differences found dataset: </target_dset1> and </target_dset1> 0 differences found dataset: </target_dset2> and </target_dset2> @@ -45,3 +48,7 @@ group : </target_group> and </target_group> 0 differences found dataset: </target_group/dset> and </target_group/dset> 0 differences found +-------------------------------- +Some objects are not comparable +-------------------------------- +Use -c for a list of objects. diff --git a/tools/h5diff/testfiles/h5diff_417.txt b/tools/h5diff/testfiles/h5diff_417.txt index 73d529d..56031e9 100644 --- a/tools/h5diff/testfiles/h5diff_417.txt +++ b/tools/h5diff/testfiles/h5diff_417.txt @@ -1,2 +1,6 @@ -error: "/no_obj" doesn't exist -error: unable to get softlink info from "/softlink_noexist" +warn: link target "/no_obj" doesn't exist +</no_obj> is of type unknown type and </target_dset2> is of type H5G_DATASET +-------------------------------- +Some objects are not comparable +-------------------------------- +Use -c for a list of objects. diff --git a/tools/h5diff/testfiles/h5diff_418.txt b/tools/h5diff/testfiles/h5diff_418.txt index 73d529d..0222174 100644 --- a/tools/h5diff/testfiles/h5diff_418.txt +++ b/tools/h5diff/testfiles/h5diff_418.txt @@ -1,2 +1,6 @@ -error: "/no_obj" doesn't exist -error: unable to get softlink info from "/softlink_noexist" +warn: link target "/no_obj" doesn't exist +</target_dset2> is of type H5G_DATASET and </no_obj> is of type unknown type +-------------------------------- +Some objects are not comparable +-------------------------------- +Use -c for a list of objects. diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 1615b8c..4b7b796 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -278,8 +278,7 @@ static int H5tools_get_softlink_target_info(hid_t file_id, const char * linkpath } else { - parallel_print("error: \"%s\" doesn't exist \n", s_trg_info->path); - goto out; + parallel_print("warn: link target \"%s\" doesn't exist \n", s_trg_info->path); } /* set target obj type to return */ |