mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-9774 Add enable-error-stack argument to h5diff

Browse Source
This commit is contained in:
Allen Byrne 2017-08-31 15:58:37 -05:00
parent abcf30f232
commit 89f65fc97e
31 changed files with 563 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MANIFEST
View File

@ -2203,6 +2203,8 @@
./tools/test/h5diff/testfiles/h5diff_63.txt
./tools/test/h5diff/testfiles/h5diff_600.txt
./tools/test/h5diff/testfiles/h5diff_601.txt
./tools/test/h5diff/testfiles/h5diff_601_ERR.err
./tools/test/h5diff/testfiles/h5diff_601_ERR.txt
./tools/test/h5diff/testfiles/h5diff_603.txt
./tools/test/h5diff/testfiles/h5diff_604.txt
./tools/test/h5diff/testfiles/h5diff_605.txt
@ -2309,11 +2311,21 @@
./tools/test/h5diff/testfiles/h5diff_452.txt
./tools/test/h5diff/testfiles/h5diff_453.txt
./tools/test/h5diff/testfiles/h5diff_454.txt
./tools/test/h5diff/testfiles/h5diff_454_ERR.err
./tools/test/h5diff/testfiles/h5diff_454_ERR.txt
./tools/test/h5diff/testfiles/h5diff_455.txt
./tools/test/h5diff/testfiles/h5diff_455_ERR.err
./tools/test/h5diff/testfiles/h5diff_455_ERR.txt
./tools/test/h5diff/testfiles/h5diff_456.txt
./tools/test/h5diff/testfiles/h5diff_457.txt
./tools/test/h5diff/testfiles/h5diff_457_ERR.err
./tools/test/h5diff/testfiles/h5diff_457_ERR.txt
./tools/test/h5diff/testfiles/h5diff_458.txt
./tools/test/h5diff/testfiles/h5diff_458_ERR.err
./tools/test/h5diff/testfiles/h5diff_458_ERR.txt
./tools/test/h5diff/testfiles/h5diff_459.txt
./tools/test/h5diff/testfiles/h5diff_459_ERR.err
./tools/test/h5diff/testfiles/h5diff_459_ERR.txt
./tools/test/h5diff/testfiles/h5diff_465.txt
./tools/test/h5diff/testfiles/h5diff_466.txt
./tools/test/h5diff/testfiles/h5diff_467.txt

12
release_docs/RELEASE.txt
View File

@ -96,7 +96,17 @@ New Features
Tools:
------
-
- h5diff
h5diff has new option enable-error-stack.
Updated h5diff with the --enable-error-stack argument, which
enables the display of the hdf5 error stack. This completes the
improvement to the main tools; h5copy, h5diff, h5dump, h5ls and
h5repack.
(ADB - 2017/08/30, HDFFV-9774)
High-Level APIs:
---------------

281
tools/lib/h5diff.c
View File

@ -449,32 +449,27 @@ static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
void *udata)
{
trav_info_t *tinfo = (trav_info_t *)udata;
diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
int ret;
int ret_value = 0;
trav_info_t *tinfo = (trav_info_t *)udata;
diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
h5tool_link_info_t lnk_info;
const char *ext_fname;
const char *ext_path;
const char *ext_fname;
const char *ext_path;
/* init linkinfo struct */
HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t));
if (!opts->follow_links)
{
if (!opts->follow_links) {
trav_info_visit_lnk(path, linfo, tinfo);
goto done;
}
switch(linfo->type)
{
switch(linfo->type) {
case H5L_TYPE_SOFT:
ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
/* error */
if (ret < 0)
if((ret_value = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links)) < 0)
goto done;
/* no dangling link option given and detect dangling link */
else if (ret == 0)
{
else if (ret_value == 0) {
tinfo->symlink_visited.dangle_link = TRUE;
trav_info_visit_lnk(path, linfo, tinfo);
if (opts->no_dangle_links)
@ -491,22 +486,18 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
goto done;
if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
{
trav_grp_objs,trav_grp_symlinks, tinfo) < 0) {
parallel_print("Error: Could not get file contents\n");
opts->err_stat = 1;
goto done;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents");
}
break;
case H5L_TYPE_EXTERNAL:
ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
/* error */
if (ret < 0)
if ((ret_value = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links)) < 0)
goto done;
/* no dangling link option given and detect dangling link */
else if (ret == 0)
{
else if (ret_value == 0) {
tinfo->symlink_visited.dangle_link = TRUE;
trav_info_visit_lnk(path, linfo, tinfo);
if (opts->no_dangle_links)
@ -526,11 +517,10 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
goto done;
if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
{
trav_grp_objs,trav_grp_symlinks, tinfo) < 0) {
parallel_print("Error: Could not get file contents\n");
opts->err_stat = 1;
goto done;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents\n");
}
break;
@ -540,7 +530,7 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
default:
parallel_print("Error: Invalid link type\n");
opts->err_stat = 1;
goto done;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Invalid link type");
break;
} /* end of switch */
@ -569,8 +559,9 @@ hsize_t h5diff(const char *fname1,
const char *fname2,
const char *objname1,
const char *objname2,
diff_opt_t *options)
diff_opt_t *opts)
{
int ret_value = 0;
hid_t file1_id = (-1);
hid_t file2_id = (-1);
char filenames[2][MAX_FILENAME];
@ -612,10 +603,10 @@ hsize_t h5diff(const char *fname1,
/*-------------------------------------------------------------------------
* check invalid combination of options
*-----------------------------------------------------------------------*/
if(!is_valid_options(options))
goto out;
if(!is_valid_options(opts))
goto done;
options->cmn_objs = 1; /* eliminate warning */
opts->cmn_objs = 1; /* eliminate warning */
/*-------------------------------------------------------------------------
* open the files first; if they are not valid, no point in continuing
@ -626,20 +617,18 @@ hsize_t h5diff(const char *fname1,
H5E_BEGIN_TRY
{
/* open file 1 */
if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
parallel_print("h5diff: <%s>: unable to open file\n", fname1);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
goto done;
} /* end if */
/* open file 2 */
if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
parallel_print("h5diff: <%s>: unable to open file\n", fname2);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
goto done;
} /* end if */
/* enable error reporting */
} H5E_END_TRY;
@ -653,15 +642,13 @@ hsize_t h5diff(const char *fname1,
h5difftrace("trav_info_init initialized\n");
/* if any object is specified */
if (objname1)
{
if (objname1) {
/* make the given object1 fullpath, start with "/" */
if (HDstrncmp(objname1, "/", 1))
{
if (HDstrncmp(objname1, "/", 1)) {
#ifdef H5_HAVE_ASPRINTF
/* Use the asprintf() routine, since it does what we're trying to do below */
if(HDasprintf(&obj1fullname, "/%s", objname1) < 0)
goto out;
goto done;
#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
obj1fullname = (char*)HDmalloc(HDstrlen(objname1) + 2);
@ -673,12 +660,11 @@ hsize_t h5diff(const char *fname1,
obj1fullname = HDstrdup(objname1);
/* make the given object2 fullpath, start with "/" */
if (HDstrncmp(objname2, "/", 1))
{
if (HDstrncmp(objname2, "/", 1)) {
#ifdef H5_HAVE_ASPRINTF
/* Use the asprintf() routine, since it does what we're trying to do below */
if(HDasprintf(&obj2fullname, "/%s", objname2) < 0)
goto out;
goto done;
#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
obj2fullname = (char*)HDmalloc(HDstrlen(objname2) + 2);
@ -693,24 +679,21 @@ hsize_t h5diff(const char *fname1,
* check if obj1 is root, group, single object or symlink
*/
h5difftrace("h5diff check if obj1 is root, group, single object or symlink\n");
if(!HDstrcmp(obj1fullname, "/"))
{
if(!HDstrcmp(obj1fullname, "/")) {
obj1type = H5TRAV_TYPE_GROUP;
}
else
{
else {
/* check if link itself exist */
if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0)
{
if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0) {
parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Object could not be found");
}
/* get info from link */
if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0)
{
if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0) {
parallel_print("Unable to get link info from <%s>\n", obj1fullname);
goto out;
H5TOOLS_INFO(H5E_tools_min_id_g, "Unable to get link info\n");
goto done;
}
info1_lp = info1_obj;
@ -718,18 +701,16 @@ hsize_t h5diff(const char *fname1,
/*
* check the type of specified path for hard and symbolic links
*/
if(src_linfo1.type == H5L_TYPE_HARD)
{
if(src_linfo1.type == H5L_TYPE_HARD) {
size_t idx;
/* optional data pass */
info1_obj->opts = (diff_opt_t*)options;
info1_obj->opts = (diff_opt_t*)opts;
if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0)
{
if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0) {
parallel_print("Error: Could not get file contents\n");
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents");
}
obj1type = (h5trav_type_t)oinfo1.type;
trav_info_add(info1_obj, obj1fullname, obj1type);
@ -737,13 +718,11 @@ hsize_t h5diff(const char *fname1,
info1_obj->paths[idx].objno = oinfo1.addr;
info1_obj->paths[idx].fileno = oinfo1.fileno;
}
else if (src_linfo1.type == H5L_TYPE_SOFT)
{
else if (src_linfo1.type == H5L_TYPE_SOFT) {
obj1type = H5TRAV_TYPE_LINK;
trav_info_add(info1_obj, obj1fullname, obj1type);
}
else if (src_linfo1.type == H5L_TYPE_EXTERNAL)
{
else if (src_linfo1.type == H5L_TYPE_EXTERNAL) {
obj1type = H5TRAV_TYPE_UDLINK;
trav_info_add(info1_obj, obj1fullname, obj1type);
}
@ -753,24 +732,20 @@ hsize_t h5diff(const char *fname1,
* check if obj2 is root, group, single object or symlink
*/
h5difftrace("h5diff check if obj2 is root, group, single object or symlink\n");
if(!HDstrcmp(obj2fullname, "/"))
{
if(!HDstrcmp(obj2fullname, "/")) {
obj2type = H5TRAV_TYPE_GROUP;
}
else
{
else {
/* check if link itself exist */
if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0)
{
if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0) {
parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Object could not be found");
}
/* get info from link */
if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0)
{
if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0) {
parallel_print("Unable to get link info from <%s>\n", obj2fullname);
goto out;
goto done;
}
info2_lp = info2_obj;
@ -778,18 +753,16 @@ hsize_t h5diff(const char *fname1,
/*
* check the type of specified path for hard and symbolic links
*/
if(src_linfo2.type == H5L_TYPE_HARD)
{
if(src_linfo2.type == H5L_TYPE_HARD) {
size_t idx;
/* optional data pass */
info2_obj->opts = (diff_opt_t*)options;
info2_obj->opts = (diff_opt_t*)opts;
if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0)
{
if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0) {
parallel_print("Error: Could not get file contents\n");
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents");
}
obj2type = (h5trav_type_t)oinfo2.type;
trav_info_add(info2_obj, obj2fullname, obj2type);
@ -797,21 +770,18 @@ hsize_t h5diff(const char *fname1,
info2_obj->paths[idx].objno = oinfo2.addr;
info2_obj->paths[idx].fileno = oinfo2.fileno;
}
else if (src_linfo2.type == H5L_TYPE_SOFT)
{
else if (src_linfo2.type == H5L_TYPE_SOFT) {
obj2type = H5TRAV_TYPE_LINK;
trav_info_add(info2_obj, obj2fullname, obj2type);
}
else if (src_linfo2.type == H5L_TYPE_EXTERNAL)
{
else if (src_linfo2.type == H5L_TYPE_EXTERNAL) {
obj2type = H5TRAV_TYPE_UDLINK;
trav_info_add(info2_obj, obj2fullname, obj2type);
}
}
}
/* if no object specified */
else
{
else {
h5difftrace("h5diff no object specified\n");
/* set root group */
obj1fullname = (char*)HDstrdup("/");
@ -822,16 +792,15 @@ hsize_t h5diff(const char *fname1,
/* get any symbolic links info */
l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, options->follow_links);
l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, options->follow_links);
l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, opts->follow_links);
l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, opts->follow_links);
/*---------------------------------------------
* check for following symlinks
*/
if (options->follow_links)
{
if (opts->follow_links) {
/* pass how to handle printing warning to linkinfo option */
if(print_warn(options))
if(print_warn(opts))
trg_linfo1.opt.msg_mode = trg_linfo2.opt.msg_mode = 1;
/*-------------------------------
@ -839,37 +808,31 @@ hsize_t h5diff(const char *fname1,
*/
h5difftrace("h5diff check symbolic link (object1)\n");
/* dangling link */
if (l_ret1 == 0)
{
if (l_ret1 == 0) {
h5difftrace("h5diff ... dangling link\n");
if (options->no_dangle_links)
{
/* treat dangling link is error */
if(options->m_verbose)
if (opts->no_dangle_links) {
/* treat dangling link as error */
if(opts->m_verbose)
parallel_print("Warning: <%s> is a dangling link.\n", obj1fullname);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: treat dangling link as error");
}
else
{
if(options->m_verbose)
else {
if(opts->m_verbose)
parallel_print("obj1 <%s> is a dangling link.\n", obj1fullname);
if (l_ret1 != 0 || l_ret2 != 0)
{
if (l_ret1 != 0 || l_ret2 != 0) {
nfound++;
print_found(nfound);
goto out;
goto done;
}
}
}
else if(l_ret1 < 0) /* fail */
{
else if(l_ret1 < 0) { /* fail */
parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Object could not be found");
}
else if(l_ret1 != 2) /* symbolic link */
{
else if(l_ret1 != 2) { /* symbolic link */
obj1type = (h5trav_type_t)trg_linfo1.trg_type;
h5difftrace("h5diff ... ... trg_linfo1.trg_type == H5L_TYPE_HARD\n");
if (info1_lp != NULL) {
@ -888,37 +851,31 @@ hsize_t h5diff(const char *fname1,
*/
h5difftrace("h5diff check symbolic link (object2)\n");
/* dangling link */
if (l_ret2 == 0)
{
if (l_ret2 == 0) {
h5difftrace("h5diff ... dangling link\n");
if (options->no_dangle_links)
{
/* treat dangling link is error */
if(options->m_verbose)
if (opts->no_dangle_links) {
/* treat dangling link as error */
if(opts->m_verbose)
parallel_print("Warning: <%s> is a dangling link.\n", obj2fullname);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: treat dangling link as error");
}
else
{
if(options->m_verbose)
else {
if(opts->m_verbose)
parallel_print("obj2 <%s> is a dangling link.\n", obj2fullname);
if (l_ret1 != 0 || l_ret2 != 0)
{
if (l_ret1 != 0 || l_ret2 != 0) {
nfound++;
print_found(nfound);
goto out;
goto done;
}
}
}
else if(l_ret2 < 0) /* fail */
{
else if(l_ret2 < 0) { /* fail */
parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Object could not be found");
}
else if(l_ret2 != 2) /* symbolic link */
{
else if(l_ret2 != 2) { /* symbolic link */
obj2type = (h5trav_type_t)trg_linfo2.trg_type;
if (info2_lp != NULL) {
size_t idx = info2_lp->nused - 1;
@ -939,32 +896,29 @@ hsize_t h5diff(const char *fname1,
* comparing details of same objects.
*/
if(!(options->m_verbose || options->m_report))
{
h5difftrace("h5diff NOT (options->m_verbose || options->m_report)\n");
if(!(opts->m_verbose || opts->m_report)) {
h5difftrace("h5diff NOT (opts->m_verbose || opts->m_report)\n");
/* if no danglink links */
if ( l_ret1 > 0 && l_ret2 > 0 )
if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname)!=0)
goto out;
goto done;
}
both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP);
if (both_objs_grp)
{
if (both_objs_grp) {
h5difftrace("h5diff both_objs_grp TRUE\n");
/*
* traverse group1
*/
trav_info_init(fname1, file1_id, &info1_grp);
/* optional data pass */
info1_grp->opts = (diff_opt_t*)options;
info1_grp->opts = (diff_opt_t*)opts;
if(h5trav_visit(file1_id, obj1fullname, TRUE, TRUE,
trav_grp_objs, trav_grp_symlinks, info1_grp) < 0)
{
trav_grp_objs, trav_grp_symlinks, info1_grp) < 0) {
parallel_print("Error: Could not get file contents\n");
options->err_stat = 1;
goto out;
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents");
}
info1_lp = info1_grp;
@ -973,25 +927,22 @@ hsize_t h5diff(const char *fname1,
*/
trav_info_init(fname2, file2_id, &info2_grp);
/* optional data pass */
info2_grp->opts = (diff_opt_t*)options;
info2_grp->opts = (diff_opt_t*)opts;
if(h5trav_visit(file2_id, obj2fullname, TRUE, TRUE,
trav_grp_objs, trav_grp_symlinks, info2_grp) < 0)
{
trav_grp_objs, trav_grp_symlinks, info2_grp) < 0) {
parallel_print("Error: Could not get file contents\n");
options->err_stat = 1;
goto out;
} /* end if */
opts->err_stat = 1;
HGOTO_ERROR(opts->err_stat, H5E_tools_min_id_g, "Error: Could not get file contents");
} /* end if */
info2_lp = info2_grp;
}
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
{
if(g_Parallel) {
int i;
if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME))
{
if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME)) {
HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
MPI_Abort(MPI_COMM_WORLD, 0);
} /* end if */
@ -1007,13 +958,12 @@ hsize_t h5diff(const char *fname1,
/* process the objects */
build_match_list (obj1fullname, info1_lp, obj2fullname, info2_lp,
&match_list, options);
if (both_objs_grp)
{
&match_list, opts);
if (both_objs_grp) {
/*------------------------------------------------------
* print the list
*/
if(options->m_verbose)
if(opts->m_verbose)
{
unsigned u;
@ -1024,8 +974,7 @@ hsize_t h5diff(const char *fname1,
else
parallel_print("file1 file2\n");
parallel_print("---------------------------------------\n");
for(u = 0; u < match_list->nobjs; u++)
{
for(u = 0; u < match_list->nobjs; u++) {
char c1, c2;
c1 = (match_list->objs[u].flags[0]) ? 'x' : ' ';
c2 = (match_list->objs[u].flags[1]) ? 'x' : ' ';
@ -1036,9 +985,9 @@ hsize_t h5diff(const char *fname1,
}
nfound = diff_match(file1_id, obj1fullname, info1_lp,
file2_id, obj2fullname, info2_lp,
match_list, options);
match_list, opts);
out:
done:
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
/* All done at this point, let tasks know that they won't be needed */

8
tools/lib/h5tools_error.h
View File

@ -61,6 +61,14 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_id_g;
ret_typ ret_value = ret_init;
/*
* H5TOOLS_INFO macro, used to facilitate error reporting . The arguments are the major
* error number, the minor error number, and a description of the error.
*/
#define H5TOOLS_INFO(min_id, str) { \
H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, min_id, str); \
}
/*
* HERROR macro, used to facilitate error reporting . The arguments are the major
* error number, the minor error number, and a description of the error.

2
tools/src/h5copy/h5copy.c
View File

@ -101,6 +101,8 @@ usage (void)
PRINTVALSTREAM(rawoutstream, " -p, --parents No error if existing, make parent groups as needed\n");
PRINTVALSTREAM(rawoutstream, " -v, --verbose Print information about OBJECTS and OPTIONS\n");
PRINTVALSTREAM(rawoutstream, " -V, --version Print version number and exit\n");
PRINTVALSTREAM(rawoutstream, " --enable-error-stack\n");
PRINTVALSTREAM(rawoutstream, " Prints messages from the HDF5 error stack as they occur.\n");
PRINTVALSTREAM(rawoutstream, " -f, --flag Flag type\n\n");
PRINTVALSTREAM(rawoutstream, " Flag type is one of the following strings:\n\n");
PRINTVALSTREAM(rawoutstream, " shallow Copy only immediate members for groups\n\n");

422
tools/src/h5diff/h5diff_common.c
View File

@ -17,15 +17,15 @@
#include "h5tools.h"
#include "h5tools_utils.h"
static int check_n_input( const char* );
static int check_p_input( const char* );
static int check_d_input( const char* );
static int check_n_input(const char*);
static int check_p_input(const char*);
static int check_d_input(const char*);
/*
* Command-line options: The user can specify short or long-named
* parameters.
*/
static const char *s_opts = "hVrv:qn:d:p:Nc";
static const char *s_opts = "hVrv:qn:d:p:NcelxE:S";
static struct long_options l_opts[] = {
{ "help", no_arg, 'h' },
{ "version", no_arg, 'V' },
@ -41,6 +41,7 @@ static struct long_options l_opts[] = {
{ "follow-symlinks", no_arg, 'l' },
{ "no-dangling-links", no_arg, 'x' },
{ "exclude-path", require_arg, 'E' },
{ "enable-error-stack", no_arg, 'S' },
{ NULL, 0, '\0' }
};
@ -60,8 +61,7 @@ static void check_options(diff_opt_t* options)
/* check between -d , -p, --use-system-epsilon.
* These options are mutually exclusive.
*/
if ((options->d + options->p + options->use_system_epsilon) > 1)
{
if ((options->d + options->p + options->use_system_epsilon) > 1) {
printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
printf("use no more than one.\n");
printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
@ -110,75 +110,79 @@ void parse_command_line(int argc,
exclude_head = NULL;
/* parse command line options */
while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
{
switch ((char)opt)
{
while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
switch ((char)opt) {
default:
usage();
h5diff_exit(EXIT_FAILURE);
case 'h':
usage();
h5diff_exit(EXIT_SUCCESS);
case 'V':
print_version(h5tools_getprogname());
h5diff_exit(EXIT_SUCCESS);
case 'v':
options->m_verbose = 1;
/* This for loop is for handling style like
* -v, -v1, --verbose, --verbose=1.
*/
for (i = 1; i < argc; i++)
{
for (i = 1; i < argc; i++) {
/*
* short opt
*/
if (!strcmp (argv[i], "-v")) /* no arg */
{
if (!strcmp (argv[i], "-v")) { /* no arg */
opt_ind--;
options->m_verbose_level = 0;
break;
}
else if (!strncmp (argv[i], "-v", (size_t)2))
{
}
else if (!strncmp (argv[i], "-v", (size_t)2)) {
options->m_verbose_level = atoi(&argv[i][2]);
break;
}
}
/*
* long opt
*/
if (!strcmp (argv[i], "--verbose")) /* no arg */
{
if (!strcmp (argv[i], "--verbose")) { /* no arg */
options->m_verbose_level = 0;
break;
}
else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=')
{
}
else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=') {
options->m_verbose_level = atoi(&argv[i][10]);
break;
}
}
break;
case 'q':
/* use quiet mode; supress the message "0 differences found" */
options->m_quiet = 1;
break;
case 'r':
options->m_report = 1;
break;
case 'l':
options->follow_links = TRUE;
break;
case 'x':
options->no_dangle_links = 1;
break;
case 'S':
enable_error_stack = TRUE;
break;
case 'E':
options->exclude_path = 1;
/* create linked list of excluding objects */
if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL)
{
if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
printf("Error: lack of memory!\n");
h5diff_exit(EXIT_FAILURE);
}
@ -188,13 +192,11 @@ void parse_command_line(int argc,
exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
exclude_prev = exclude_head;
if (NULL == exclude_head)
{
if (NULL == exclude_head) {
exclude_head = exclude_node;
exclude_head->next = NULL;
}
else
{
else {
while(NULL != exclude_prev->next)
exclude_prev=exclude_prev->next;
@ -202,46 +204,40 @@ void parse_command_line(int argc,
exclude_prev->next = exclude_node;
}
break;
case 'd':
options->d=1;
if ( check_d_input( opt_arg )==-1)
{
printf("<-d %s> is not a valid option\n", opt_arg );
if (check_d_input(opt_arg) == - 1) {
printf("<-d %s> is not a valid option\n", opt_arg);
usage();
h5diff_exit(EXIT_FAILURE);
}
options->delta = atof( opt_arg );
options->delta = atof(opt_arg);
/* -d 0 is the same as default */
if (H5_DBL_ABS_EQUAL(options->delta, (double)0.0F))
options->d=0;
options->d=0;
break;
case 'p':
options->p=1;
if ( check_p_input( opt_arg )==-1)
{
printf("<-p %s> is not a valid option\n", opt_arg );
if (check_p_input(opt_arg) == -1) {
printf("<-p %s> is not a valid option\n", opt_arg);
usage();
h5diff_exit(EXIT_FAILURE);
}
options->percent = atof( opt_arg );
options->percent = atof(opt_arg);
/* -p 0 is the same as default */
if (H5_DBL_ABS_EQUAL(options->percent, (double)0.0F))
options->p = 0;
options->p = 0;
break;
case 'n':
options->n=1;
if ( check_n_input( opt_arg )==-1)
{
printf("<-n %s> is not a valid option\n", opt_arg );
if ( check_n_input(opt_arg) == -1) {
printf("<-n %s> is not a valid option\n", opt_arg);
usage();
h5diff_exit(EXIT_FAILURE);
}
@ -270,8 +266,7 @@ void parse_command_line(int argc,
options->exclude = exclude_head;
/* check for file names to be processed */
if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
{
if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) {
error_msg("missing file names\n");
usage();
h5diff_exit(EXIT_FAILURE);
@ -281,18 +276,15 @@ void parse_command_line(int argc,
*fname2 = argv[ opt_ind + 1 ];
*objname1 = argv[ opt_ind + 2 ];
if ( *objname1 == NULL )
{
if (*objname1 == NULL) {
*objname2 = NULL;
return;
}
if ( argv[ opt_ind + 3 ] != NULL)
{
if (argv[ opt_ind + 3 ] != NULL) {
*objname2 = argv[ opt_ind + 3 ];
}
else
{
else {
*objname2 = *objname1;
}
@ -310,20 +302,17 @@ void parse_command_line(int argc,
void print_info(diff_opt_t* options)
{
if (options->m_quiet || options->err_stat )
if (options->m_quiet || options->err_stat)
return;
if (options->cmn_objs==0)
{
if (options->cmn_objs == 0) {
printf("No common objects found. Files are not comparable.\n");
if (!options->m_verbose)
printf("Use -v for a list of objects.\n");
}
if (options->not_cmp==1)
{
if ( options->m_list_not_cmp == 0 )
{
if (options->not_cmp == 1) {
if (options->m_list_not_cmp == 0) {
printf("--------------------------------\n");
printf("Some objects are not comparable\n");
printf("--------------------------------\n");
@ -332,10 +321,7 @@ void parse_command_line(int argc,
else
printf("Use -c for a list of objects.\n");
}
}
}
/*-------------------------------------------------------------------------
@ -361,16 +347,14 @@ check_n_input( const char *str )
unsigned i;
char c;
for ( i = 0; i < strlen(str); i++)
{
for (i = 0; i < strlen(str); i++) {
c = str[i];
if ( i==0 )
{
if ( c < 49 || c > 57 ) /* ascii values between 1 and 9 */
if (i == 0) {
if (c < 49 || c > 57) /* ascii values between 1 and 9 */
return -1;
}
else
if ( c < 48 || c > 57 ) /* 0 also */
if (c < 48 || c > 57) /* 0 also */
return -1;
}
return 1;
@ -400,11 +384,11 @@ check_p_input( const char *str )
the atof return value on a hexadecimal input is different
on some systems; we do a character check for this
*/
if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
return -1;
x=atof(str);
if (x<0)
x = atof(str);
if (x < 0)
return -1;
return 1;
@ -434,11 +418,11 @@ check_d_input( const char *str )
the atof return value on a hexadecimal input is different
on some systems; we do a character check for this
*/
if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
return -1;
x=atof(str);
if (x <0)
x = atof(str);
if (x < 0)
return -1;
return 1;
@ -456,151 +440,153 @@ check_d_input( const char *str )
void usage(void)
{
printf("usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
printf(" file1 File name of the first HDF5 file\n");
printf(" file2 File name of the second HDF5 file\n");
printf(" [obj1] Name of an HDF5 object, in absolute path\n");
printf(" [obj2] Name of an HDF5 object, in absolute path\n");
printf("\n");
printf(" OPTIONS\n");
printf(" -h, --help\n");
printf(" Print a usage message and exit.\n");
printf(" -V, --version\n");
printf(" Print version number and exit.\n");
printf(" -r, --report\n");
printf(" Report mode. Print differences.\n");
printf(" -v --verbose\n");
printf(" Verbose mode. Print differences information and list of objects.\n");
printf(" -vN --verbose=N\n");
printf(" Verbose mode with level. Print differences and list of objects.\n");
printf(" Level of detail depends on value of N:\n");
printf(" 0 : Identical to '-v' or '--verbose'.\n");
printf(" 1 : All level 0 information plus one-line attribute\n");
printf(" status summary.\n");
printf(" 2 : All level 1 information plus extended attribute\n");
printf(" status report.\n");
printf(" -q, --quiet\n");
printf(" Quiet mode. Do not produce output.\n");
printf(" --follow-symlinks\n");
printf(" Follow symbolic links (soft links and external links and compare the)\n");
printf(" links' target objects.\n");
printf(" If symbolic link(s) with the same name exist in the files being\n");
printf(" compared, then determine whether the target of each link is an existing\n");
printf(" object (dataset, group, or named datatype) or the link is a dangling\n");
printf(" link (a soft or external link pointing to a target object that does\n");
printf(" not yet exist).\n");
printf(" - If both symbolic links are dangling links, they are treated as being\n");
printf(" the same; by default, h5diff returns an exit code of 0.\n");
printf(" If, however, --no-dangling-links is used with --follow-symlinks,\n");
printf(" this situation is treated as an error and h5diff returns an\n");
printf(" exit code of 2.\n");
printf(" - If only one of the two links is a dangling link,they are treated as\n");
printf(" being different and h5diff returns an exit code of 1.\n");
printf(" If, however, --no-dangling-links is used with --follow-symlinks,\n");
printf(" this situation is treated as an error and h5diff returns an\n");
printf(" exit code of 2.\n");
printf(" - If both symbolic links point to existing objects, h5diff compares the\n");
printf(" two objects.\n");
printf(" If any symbolic link specified in the call to h5diff does not exist,\n");
printf(" h5diff treats it as an error and returns an exit code of 2.\n");
printf(" --no-dangling-links\n");
printf(" Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
printf(" error message and returns an exit code of 2.\n");
printf(" Check for any symbolic links (soft links or external links) that do not\n");
printf(" resolve to an existing object (dataset, group, or named datatype).\n");
printf(" If any dangling link is found, this situation is treated as an error\n");
printf(" and h5diff returns an exit code of 2.\n");
printf(" -c, --compare\n");
printf(" List objects that are not comparable\n");
printf(" -N, --nan\n");
printf(" Avoid NaNs detection\n");
printf(" -n C, --count=C\n");
printf(" Print differences up to C. C must be a positive integer.\n");
printf(" -d D, --delta=D\n");
printf(" Print difference if (|a-b| > D). D must be a positive number. Where a\n");
printf(" is the data point value in file1 and b is the data point value in file2.\n");
printf(" Can not use with '-p' or '--use-system-epsilon'.\n");
printf(" -p R, --relative=R\n");
printf(" Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
printf(" is the data point value in file1 and b is the data point value in file2.\n");
printf(" Can not use with '-d' or '--use-system-epsilon'.\n");
printf(" --use-system-epsilon\n");
printf(" Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
printf(" is the data point value in file1 and b is the data point value in file2.\n");
printf(" If the system epsilon is not defined,one of the following predefined\n");
printf(" values will be used:\n");
printf(" FLT_EPSILON = 1.19209E-07 for floating-point type\n");
printf(" DBL_EPSILON = 2.22045E-16 for double precision type\n");
printf(" Can not use with '-p' or '-d'.\n");
printf(" --exclude-path \"path\"\n");
printf(" Exclude the specified path to an object when comparing files or groups.\n");
printf(" If a group is excluded, all member objects will also be excluded.\n");
printf(" The specified path is excluded wherever it occurs.\n");
printf(" This flexibility enables the same option to exclude either objects that\n");
printf(" exist only in one file or common objects that are known to differ.\n");
printf("\n");
printf(" When comparing files, \"path\" is the absolute path to the excluded;\n");
printf(" object; when comparing groups, \"path\" is similar to the relative\n");
printf(" path from the group to the excluded object. This \"path\" can be\n");
printf(" taken from the first section of the output of the --verbose option.\n");
printf(" For example, if you are comparing the group /groupA in two files and\n");
printf(" you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
printf(" option would read as follows:\n");
printf(" --exclude-path \"/groupB/groupC\"\n");
printf("\n");
printf(" If there are multiple paths to an object, only the specified path(s)\n");
printf(" will be excluded; the comparison will include any path not explicitly\n");
printf(" excluded.\n");
printf(" This option can be used repeatedly to exclude multiple paths.\n");
printf("\n");
PRINTVALSTREAM(rawoutstream, "usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
PRINTVALSTREAM(rawoutstream, " file1 File name of the first HDF5 file\n");
PRINTVALSTREAM(rawoutstream, " file2 File name of the second HDF5 file\n");
PRINTVALSTREAM(rawoutstream, " [obj1] Name of an HDF5 object, in absolute path\n");
PRINTVALSTREAM(rawoutstream, " [obj2] Name of an HDF5 object, in absolute path\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " OPTIONS\n");
PRINTVALSTREAM(rawoutstream, " -h, --help\n");
PRINTVALSTREAM(rawoutstream, " Print a usage message and exit.\n");
PRINTVALSTREAM(rawoutstream, " -V, --version\n");
PRINTVALSTREAM(rawoutstream, " Print version number and exit.\n");
PRINTVALSTREAM(rawoutstream, " -r, --report\n");
PRINTVALSTREAM(rawoutstream, " Report mode. Print differences.\n");
PRINTVALSTREAM(rawoutstream, " -v --verbose\n");
PRINTVALSTREAM(rawoutstream, " Verbose mode. Print differences information and list of objects.\n");
PRINTVALSTREAM(rawoutstream, " -vN --verbose=N\n");
PRINTVALSTREAM(rawoutstream, " Verbose mode with level. Print differences and list of objects.\n");
PRINTVALSTREAM(rawoutstream, " Level of detail depends on value of N:\n");
PRINTVALSTREAM(rawoutstream, " 0 : Identical to '-v' or '--verbose'.\n");
PRINTVALSTREAM(rawoutstream, " 1 : All level 0 information plus one-line attribute\n");
PRINTVALSTREAM(rawoutstream, " status summary.\n");
PRINTVALSTREAM(rawoutstream, " 2 : All level 1 information plus extended attribute\n");
PRINTVALSTREAM(rawoutstream, " status report.\n");
PRINTVALSTREAM(rawoutstream, " -q, --quiet\n");
PRINTVALSTREAM(rawoutstream, " Quiet mode. Do not produce output.\n");
PRINTVALSTREAM(rawoutstream, " --enable-error-stack\n");
PRINTVALSTREAM(rawoutstream, " Prints messages from the HDF5 error stack as they occur.\n");
PRINTVALSTREAM(rawoutstream, " --follow-symlinks\n");
PRINTVALSTREAM(rawoutstream, " Follow symbolic links (soft links and external links and compare the)\n");
PRINTVALSTREAM(rawoutstream, " links' target objects.\n");
PRINTVALSTREAM(rawoutstream, " If symbolic link(s) with the same name exist in the files being\n");
PRINTVALSTREAM(rawoutstream, " compared, then determine whether the target of each link is an existing\n");
PRINTVALSTREAM(rawoutstream, " object (dataset, group, or named datatype) or the link is a dangling\n");
PRINTVALSTREAM(rawoutstream, " link (a soft or external link pointing to a target object that does\n");
PRINTVALSTREAM(rawoutstream, " not yet exist).\n");
PRINTVALSTREAM(rawoutstream, " - If both symbolic links are dangling links, they are treated as being\n");
PRINTVALSTREAM(rawoutstream, " the same; by default, h5diff returns an exit code of 0.\n");
PRINTVALSTREAM(rawoutstream, " If, however, --no-dangling-links is used with --follow-symlinks,\n");
PRINTVALSTREAM(rawoutstream, " this situation is treated as an error and h5diff returns an\n");
PRINTVALSTREAM(rawoutstream, " exit code of 2.\n");
PRINTVALSTREAM(rawoutstream, " - If only one of the two links is a dangling link,they are treated as\n");
PRINTVALSTREAM(rawoutstream, " being different and h5diff returns an exit code of 1.\n");
PRINTVALSTREAM(rawoutstream, " If, however, --no-dangling-links is used with --follow-symlinks,\n");
PRINTVALSTREAM(rawoutstream, " this situation is treated as an error and h5diff returns an\n");
PRINTVALSTREAM(rawoutstream, " exit code of 2.\n");
PRINTVALSTREAM(rawoutstream, " - If both symbolic links point to existing objects, h5diff compares the\n");
PRINTVALSTREAM(rawoutstream, " two objects.\n");
PRINTVALSTREAM(rawoutstream, " If any symbolic link specified in the call to h5diff does not exist,\n");
PRINTVALSTREAM(rawoutstream, " h5diff treats it as an error and returns an exit code of 2.\n");
PRINTVALSTREAM(rawoutstream, " --no-dangling-links\n");
PRINTVALSTREAM(rawoutstream, " Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
PRINTVALSTREAM(rawoutstream, " error message and returns an exit code of 2.\n");
PRINTVALSTREAM(rawoutstream, " Check for any symbolic links (soft links or external links) that do not\n");
PRINTVALSTREAM(rawoutstream, " resolve to an existing object (dataset, group, or named datatype).\n");
PRINTVALSTREAM(rawoutstream, " If any dangling link is found, this situation is treated as an error\n");
PRINTVALSTREAM(rawoutstream, " and h5diff returns an exit code of 2.\n");
PRINTVALSTREAM(rawoutstream, " -c, --compare\n");
PRINTVALSTREAM(rawoutstream, " List objects that are not comparable\n");
PRINTVALSTREAM(rawoutstream, " -N, --nan\n");
PRINTVALSTREAM(rawoutstream, " Avoid NaNs detection\n");
PRINTVALSTREAM(rawoutstream, " -n C, --count=C\n");
PRINTVALSTREAM(rawoutstream, " Print differences up to C. C must be a positive integer.\n");
PRINTVALSTREAM(rawoutstream, " -d D, --delta=D\n");
PRINTVALSTREAM(rawoutstream, " Print difference if (|a-b| > D). D must be a positive number. Where a\n");
PRINTVALSTREAM(rawoutstream, " is the data point value in file1 and b is the data point value in file2.\n");
PRINTVALSTREAM(rawoutstream, " Can not use with '-p' or '--use-system-epsilon'.\n");
PRINTVALSTREAM(rawoutstream, " -p R, --relative=R\n");
PRINTVALSTREAM(rawoutstream, " Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
PRINTVALSTREAM(rawoutstream, " is the data point value in file1 and b is the data point value in file2.\n");
PRINTVALSTREAM(rawoutstream, " Can not use with '-d' or '--use-system-epsilon'.\n");
PRINTVALSTREAM(rawoutstream, " --use-system-epsilon\n");
PRINTVALSTREAM(rawoutstream, " Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
PRINTVALSTREAM(rawoutstream, " is the data point value in file1 and b is the data point value in file2.\n");
PRINTVALSTREAM(rawoutstream, " If the system epsilon is not defined,one of the following predefined\n");
PRINTVALSTREAM(rawoutstream, " values will be used:\n");
PRINTVALSTREAM(rawoutstream, " FLT_EPSILON = 1.19209E-07 for floating-point type\n");
PRINTVALSTREAM(rawoutstream, " DBL_EPSILON = 2.22045E-16 for double precision type\n");
PRINTVALSTREAM(rawoutstream, " Can not use with '-p' or '-d'.\n");
PRINTVALSTREAM(rawoutstream, " --exclude-path \"path\"\n");
PRINTVALSTREAM(rawoutstream, " Exclude the specified path to an object when comparing files or groups.\n");
PRINTVALSTREAM(rawoutstream, " If a group is excluded, all member objects will also be excluded.\n");
PRINTVALSTREAM(rawoutstream, " The specified path is excluded wherever it occurs.\n");
PRINTVALSTREAM(rawoutstream, " This flexibility enables the same option to exclude either objects that\n");
PRINTVALSTREAM(rawoutstream, " exist only in one file or common objects that are known to differ.\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " When comparing files, \"path\" is the absolute path to the excluded;\n");
PRINTVALSTREAM(rawoutstream, " object; when comparing groups, \"path\" is similar to the relative\n");
PRINTVALSTREAM(rawoutstream, " path from the group to the excluded object. This \"path\" can be\n");
PRINTVALSTREAM(rawoutstream, " taken from the first section of the output of the --verbose option.\n");
PRINTVALSTREAM(rawoutstream, " For example, if you are comparing the group /groupA in two files and\n");
PRINTVALSTREAM(rawoutstream, " you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
PRINTVALSTREAM(rawoutstream, " option would read as follows:\n");
PRINTVALSTREAM(rawoutstream, " --exclude-path \"/groupB/groupC\"\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " If there are multiple paths to an object, only the specified path(s)\n");
PRINTVALSTREAM(rawoutstream, " will be excluded; the comparison will include any path not explicitly\n");
PRINTVALSTREAM(rawoutstream, " excluded.\n");
PRINTVALSTREAM(rawoutstream, " This option can be used repeatedly to exclude multiple paths.\n");
PRINTVALSTREAM(rawoutstream, "\n");
printf(" Modes of output:\n");
printf(" Default mode: print the number of differences found and where they occured\n");
printf(" -r Report mode: print the above plus the differences\n");
printf(" -v Verbose mode: print the above plus a list of objects and warnings\n");
printf(" -q Quiet mode: do not print output\n");
PRINTVALSTREAM(rawoutstream, " Modes of output:\n");
PRINTVALSTREAM(rawoutstream, " Default mode: print the number of differences found and where they occured\n");
PRINTVALSTREAM(rawoutstream, " -r Report mode: print the above plus the differences\n");
PRINTVALSTREAM(rawoutstream, " -v Verbose mode: print the above plus a list of objects and warnings\n");
PRINTVALSTREAM(rawoutstream, " -q Quiet mode: do not print output\n");
printf("\n");
PRINTVALSTREAM(rawoutstream, "\n");
printf(" File comparison:\n");
printf(" If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
printf(" a comparison of the two files' root groups. That is, h5diff first compares\n");
printf(" the names of root group members, generates a report of root group objects\n");
printf(" that appear in only one file or in both files, and recursively compares\n");
printf(" common objects.\n");
printf("\n");
PRINTVALSTREAM(rawoutstream, " File comparison:\n");
PRINTVALSTREAM(rawoutstream, " If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
PRINTVALSTREAM(rawoutstream, " a comparison of the two files' root groups. That is, h5diff first compares\n");
PRINTVALSTREAM(rawoutstream, " the names of root group members, generates a report of root group objects\n");
PRINTVALSTREAM(rawoutstream, " that appear in only one file or in both files, and recursively compares\n");
PRINTVALSTREAM(rawoutstream, " common objects.\n");
PRINTVALSTREAM(rawoutstream, "\n");
printf(" Object comparison:\n");
printf(" 1) Groups\n");
printf(" First compares the names of member objects (relative path, from the\n");
printf(" specified group) and generates a report of objects that appear in only\n");
printf(" one group or in both groups. Common objects are then compared recursively.\n");
printf(" 2) Datasets\n");
printf(" Array rank and dimensions, datatypes, and data values are compared.\n");
printf(" 3) Datatypes\n");
printf(" The comparison is based on the return value of H5Tequal.\n");
printf(" 4) Symbolic links\n");
printf(" The paths to the target objects are compared.\n");
printf(" (The option --follow-symlinks overrides the default behavior when\n");
printf(" symbolic links are compared.).\n");
printf("\n");
PRINTVALSTREAM(rawoutstream, " Object comparison:\n");
PRINTVALSTREAM(rawoutstream, " 1) Groups\n");
PRINTVALSTREAM(rawoutstream, " First compares the names of member objects (relative path, from the\n");
PRINTVALSTREAM(rawoutstream, " specified group) and generates a report of objects that appear in only\n");
PRINTVALSTREAM(rawoutstream, " one group or in both groups. Common objects are then compared recursively.\n");
PRINTVALSTREAM(rawoutstream, " 2) Datasets\n");
PRINTVALSTREAM(rawoutstream, " Array rank and dimensions, datatypes, and data values are compared.\n");
PRINTVALSTREAM(rawoutstream, " 3) Datatypes\n");
PRINTVALSTREAM(rawoutstream, " The comparison is based on the return value of H5Tequal.\n");
PRINTVALSTREAM(rawoutstream, " 4) Symbolic links\n");
PRINTVALSTREAM(rawoutstream, " The paths to the target objects are compared.\n");
PRINTVALSTREAM(rawoutstream, " (The option --follow-symlinks overrides the default behavior when\n");
PRINTVALSTREAM(rawoutstream, " symbolic links are compared.).\n");
PRINTVALSTREAM(rawoutstream, "\n");
printf(" Exit code:\n");
printf(" 0 if no differences, 1 if differences found, 2 if error\n");
printf("\n");
printf(" Examples of use:\n");
printf(" 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
printf(" Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
printf("\n");
printf(" 2) h5diff file1 file2 /g1/dset1\n");
printf(" Compares object '/g1/dset1' in both files\n");
printf("\n");
printf(" 3) h5diff file1 file2\n");
printf(" Compares all objects in both files\n");
printf("\n");
printf(" Notes:\n");
printf(" file1 and file2 can be the same file.\n");
printf(" Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
printf(" '/g1/dset1' and '/g1/dset2' in the same file\n");
printf("\n");
PRINTVALSTREAM(rawoutstream, " Exit code:\n");
PRINTVALSTREAM(rawoutstream, " 0 if no differences, 1 if differences found, 2 if error\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " Examples of use:\n");
PRINTVALSTREAM(rawoutstream, " 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
PRINTVALSTREAM(rawoutstream, " Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " 2) h5diff file1 file2 /g1/dset1\n");
PRINTVALSTREAM(rawoutstream, " Compares object '/g1/dset1' in both files\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " 3) h5diff file1 file2\n");
PRINTVALSTREAM(rawoutstream, " Compares all objects in both files\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " Notes:\n");
PRINTVALSTREAM(rawoutstream, " file1 and file2 can be the same file.\n");
PRINTVALSTREAM(rawoutstream, " Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
PRINTVALSTREAM(rawoutstream, " '/g1/dset1' and '/g1/dset2' in the same file\n");
PRINTVALSTREAM(rawoutstream, "\n");
}

27
tools/src/h5diff/h5diff_main.c
View File

@ -69,6 +69,10 @@
int main(int argc, const char *argv[])
{
int ret;
H5E_auto2_t func;
H5E_auto2_t tools_func;
void *edata;
void *tools_edata;
const char *fname1 = NULL;
const char *fname2 = NULL;
const char *objname1 = NULL;
@ -79,21 +83,34 @@ int main(int argc, const char *argv[])
h5tools_setprogname(PROGRAMNAME);
h5tools_setstatus(EXIT_SUCCESS);
/* Disable error reporting */
H5Eget_auto2(H5E_DEFAULT, &func, &edata);
H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Initialize h5tools lib */
h5tools_init();
/* Disable tools error reporting */
H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
/*-------------------------------------------------------------------------
* process the command-line
*-------------------------------------------------------------------------
*/
parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
if (enable_error_stack) {
H5Eset_auto2(H5E_DEFAULT, func, edata);
H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
}
/*-------------------------------------------------------------------------
* do the diff
*-------------------------------------------------------------------------
*/
nfound = h5diff(fname1,fname2,objname1,objname2,&options);
nfound = h5diff(fname1, fname2, objname1, objname2, &options);
print_info(&options);
@ -103,17 +120,17 @@ int main(int argc, const char *argv[])
*-------------------------------------------------------------------------
*/
ret = (nfound == 0 ? 0 : 1 );
ret = (nfound == 0 ? 0 : 1);
/* if graph difference return 1 for differences */
if ( options.contents == 0 )
if (options.contents == 0)
ret = 1;
/* and return 2 for error */
if (options.err_stat)
ret = 2;
return ret;
h5diff_exit(ret);
}
/*-------------------------------------------------------------------------
@ -135,6 +152,8 @@ int main(int argc, const char *argv[])
H5_ATTR_NORETURN void
h5diff_exit(int status)
{
h5tools_close();
HDexit(status);
}

2
tools/src/h5diff/ph5diff_main.c
View File

@ -316,6 +316,8 @@ void h5diff_exit(int status)
status = EXIT_SUCCESS; /* Reset exit status, since some mpiexec commands generate output on failure status */
}
h5tools_close();
/* Always exit(0), since MPI implementations do weird stuff when they
* receive a non-zero exit value. - QAK
*/

106
tools/test/h5diff/CMakeTests.cmake
View File

@ -171,11 +171,21 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt
@ -231,6 +241,8 @@
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt
${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt
@ -379,6 +391,37 @@
endif ()
endmacro ()
macro (ADD_H5_ERR_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME H5DIFF_ERR-${resultfile} COMMAND $<TARGET_FILE:h5diff> --enable-error-stack ${ARGN})
set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
if (NOT ${resultcode} STREQUAL "0")
set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES WILL_FAIL "true")
endif ()
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
else ()
add_test (
NAME H5DIFF_ERR-${resultfile}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
-D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
-D "TEST_APPEND=EXIT CODE:"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (NOT "${last_test}" STREQUAL "")
set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "H5DIFF_ERR-${resultfile}")
endmacro ()
macro (ADD_PH5_TEST resultfile resultcode)
# If using memchecker add tests without using scripts
if (HDF5_ENABLE_USING_MEMCHECKER)
@ -458,6 +501,51 @@
endif ()
endmacro ()
macro (ADD_H5_UD_ERR_TEST testname resultcode resultfile)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
# Remove any output file left over from previous test run
add_test (
NAME H5DIFF_UD_ERR-${testname}-clearall-objects
COMMAND ${CMAKE_COMMAND}
-E remove
testfiles/${resultfile}_ERR.out
testfiles/${resultfile}_ERR.out.err
)
if (${resultcode} STREQUAL "2")
add_test (
NAME H5DIFF_UD_ERR-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
-D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
-D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
else ()
add_test (
NAME H5DIFF_UD_ERR-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
-D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
-D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
set_tests_properties (H5DIFF_UD_ERR-${testname} PROPERTIES DEPENDS H5DIFF_UD_ERR-${testname}-clearall-objects)
endif ()
endmacro ()
##############################################################################
##############################################################################
### T H E T E S T S ###
@ -680,16 +768,26 @@
h5diff_453.out.err
h5diff_454.out
h5diff_454.out.err
h5diff_454_ERR.out
h5diff_454_ERR.out.err
h5diff_455.out
h5diff_455.out.err
h5diff_455_ERR.out
h5diff_455_ERR.out.err
h5diff_456.out
h5diff_456.out.err
h5diff_457.out
h5diff_457.out.err
h5diff_457_ERR.out
h5diff_457_ERR.out.err
h5diff_458.out
h5diff_458.out.err
h5diff_458_ERR.out
h5diff_458_ERR.out.err
h5diff_459.out
h5diff_459.out.err
h5diff_459_ERR.out
h5diff_459_ERR.out.err
h5diff_465.out
h5diff_465.out.err
h5diff_466.out
@ -794,6 +892,8 @@
h5diff_600.out.err
h5diff_601.out
h5diff_601.out.err
h5diff_601_ERR.out
h5diff_601_ERR.out.err
h5diff_603.out
h5diff_603.out.err
h5diff_604.out
@ -1047,6 +1147,7 @@ ADD_H5_TEST (h5diff_600 1 ${FILE1})
# 6.1: Check if non-exist object name is specified
ADD_H5_TEST (h5diff_601 2 ${FILE1} ${FILE1} nono_obj)
ADD_H5_ERR_TEST (h5diff_601 2 ${FILE1} ${FILE1} nono_obj)
# ##############################################################################
# # -d
@ -1350,21 +1451,26 @@ ADD_H5_TEST (h5diff_453 2 --follow-symlinks -v --no-dangling-links ${FILE13} $
# dangling link found for soft links (obj to obj)
ADD_H5_TEST (h5diff_454 2 --follow-symlinks -v --no-dangling-links ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
ADD_H5_ERR_TEST (h5diff_454 2 --follow-symlinks -v --no-dangling-links ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
# dangling link found for soft links (obj to obj) Both dangle links
ADD_H5_TEST (h5diff_455 2 --follow-symlinks -v --no-dangling-links ${FILE13} ${FILE13} /softlink_noexist /softlink_noexist)
ADD_H5_ERR_TEST (h5diff_455 2 --follow-symlinks -v --no-dangling-links ${FILE13} ${FILE13} /softlink_noexist /softlink_noexist)
# dangling link found for ext links (FILE to FILE)
ADD_H5_TEST (h5diff_456 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15})
# dangling link found for ext links (obj to obj). target file exist
ADD_H5_TEST (h5diff_457 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist1)
ADD_H5_ERR_TEST (h5diff_457 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist1)
# dangling link found for ext links (obj to obj). target file NOT exist
ADD_H5_TEST (h5diff_458 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist2)
ADD_H5_ERR_TEST (h5diff_458 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist2)
# dangling link found for ext links (obj to obj). Both dangle links
ADD_H5_TEST (h5diff_459 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_noexist2)
ADD_H5_ERR_TEST (h5diff_459 2 --follow-symlinks -v --no-dangling-links ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_noexist2)
# dangling link --follow-symlinks (obj vs obj)
# (HDFFV-7836)

2
tools/test/h5diff/testfiles/h5diff_10.txt
View File

@ -23,6 +23,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

4
tools/test/h5diff/testfiles/h5diff_454_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_454_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Warning: </softlink_noexist> is a dangling link.
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2

4
tools/test/h5diff/testfiles/h5diff_455_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_455_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Warning: </softlink_noexist> is a dangling link.
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2

4
tools/test/h5diff/testfiles/h5diff_457_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_457_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Warning: </ext_link_noexist1> is a dangling link.
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2

4
tools/test/h5diff/testfiles/h5diff_458_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_458_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Warning: </ext_link_noexist2> is a dangling link.
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2

4
tools/test/h5diff/testfiles/h5diff_459_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_459_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Warning: </ext_link_noexist1> is a dangling link.
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2

2
tools/test/h5diff/testfiles/h5diff_600.txt
View File

@ -23,6 +23,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

4
tools/test/h5diff/testfiles/h5diff_601_ERR.err Normal file
View File

@ -0,0 +1,4 @@
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 690 in h5diff(): Error: Object could not be found
major: Failure in tools library
minor: error in function

6
tools/test/h5diff/testfiles/h5diff_601_ERR.txt Normal file
View File

@ -0,0 +1,6 @@
Object </nono_obj> could not be found in <h5diff_basic1.h5>
H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
#000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 690 in h5diff(): Error: Object could not be found
major: Failure in tools library
minor: error in function
EXIT CODE: 2

2
tools/test/h5diff/testfiles/h5diff_603.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_606.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_612.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_615.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_621.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_622.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_623.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.

2
tools/test/h5diff/testfiles/h5diff_624.txt
View File

@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
status report.
-q, --quiet
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.