From ad9e876b0c767c97fdbef57509f3395768e58b44 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Tue, 16 Feb 2010 14:43:05 -0500 Subject: [svn-r18266] Purpose: bugzilla 1754: h5diff: support comparing through links. (original check-in svn revision #18164) Description: fix the hang issue in parallel mode when compare external-link. add --no-dangling-links option. add test cases (#450-#459) relate to the new option. improve test script to check exit code. update --help relate to the new options. correct some indentations. Tested: h5committest (jam, amani and linew) --- MANIFEST | 12 + release_docs/RELEASE.txt | 5 +- tools/h5diff/h5diff_common.c | 118 +-- tools/h5diff/h5diff_main.c | 20 + tools/h5diff/testfiles/h5diff_10.txt | 99 ++- tools/h5diff/testfiles/h5diff_100.txt | 1 + tools/h5diff/testfiles/h5diff_101.txt | 1 + tools/h5diff/testfiles/h5diff_102.txt | 1 + tools/h5diff/testfiles/h5diff_11.txt | 1 + tools/h5diff/testfiles/h5diff_12.txt | 1 + tools/h5diff/testfiles/h5diff_13.txt | 1 + tools/h5diff/testfiles/h5diff_14.txt | 1 + tools/h5diff/testfiles/h5diff_15.txt | 1 + tools/h5diff/testfiles/h5diff_16_1.txt | 1 + tools/h5diff/testfiles/h5diff_16_2.txt | 1 + tools/h5diff/testfiles/h5diff_16_3.txt | 1 + tools/h5diff/testfiles/h5diff_17.txt | 1 + tools/h5diff/testfiles/h5diff_171.txt | 1 + tools/h5diff/testfiles/h5diff_172.txt | 1 + tools/h5diff/testfiles/h5diff_18.txt | 1 + tools/h5diff/testfiles/h5diff_19.txt | 1 + tools/h5diff/testfiles/h5diff_20.txt | 1 + tools/h5diff/testfiles/h5diff_200.txt | 1 + tools/h5diff/testfiles/h5diff_201.txt | 1 + tools/h5diff/testfiles/h5diff_202.txt | 1 + tools/h5diff/testfiles/h5diff_203.txt | 1 + tools/h5diff/testfiles/h5diff_204.txt | 1 + tools/h5diff/testfiles/h5diff_205.txt | 1 + tools/h5diff/testfiles/h5diff_206.txt | 1 + tools/h5diff/testfiles/h5diff_207.txt | 1 + tools/h5diff/testfiles/h5diff_21.txt | 1 + tools/h5diff/testfiles/h5diff_22.txt | 1 + tools/h5diff/testfiles/h5diff_23.txt | 1 + tools/h5diff/testfiles/h5diff_24.txt | 1 + tools/h5diff/testfiles/h5diff_25.txt | 1 + tools/h5diff/testfiles/h5diff_26.txt | 1 + tools/h5diff/testfiles/h5diff_27.txt | 1 + tools/h5diff/testfiles/h5diff_28.txt | 1 + tools/h5diff/testfiles/h5diff_300.txt | 1 + tools/h5diff/testfiles/h5diff_400.txt | 20 +- tools/h5diff/testfiles/h5diff_401.txt | 5 +- tools/h5diff/testfiles/h5diff_402.txt | 5 +- tools/h5diff/testfiles/h5diff_403.txt | 5 +- tools/h5diff/testfiles/h5diff_404.txt | 16 +- tools/h5diff/testfiles/h5diff_405.txt | 5 +- tools/h5diff/testfiles/h5diff_406.txt | 5 +- tools/h5diff/testfiles/h5diff_407.txt | 5 +- tools/h5diff/testfiles/h5diff_408.txt | 5 +- tools/h5diff/testfiles/h5diff_409.txt | 5 +- tools/h5diff/testfiles/h5diff_410.txt | 25 +- tools/h5diff/testfiles/h5diff_411.txt | 5 +- tools/h5diff/testfiles/h5diff_412.txt | 5 +- tools/h5diff/testfiles/h5diff_413.txt | 5 +- tools/h5diff/testfiles/h5diff_414.txt | 3 +- tools/h5diff/testfiles/h5diff_415.txt | 3 +- tools/h5diff/testfiles/h5diff_416.txt | 3 +- tools/h5diff/testfiles/h5diff_417.txt | 9 +- tools/h5diff/testfiles/h5diff_418.txt | 9 +- tools/h5diff/testfiles/h5diff_419.txt | 5 +- tools/h5diff/testfiles/h5diff_420.txt | 5 +- tools/h5diff/testfiles/h5diff_421.txt | 5 +- tools/h5diff/testfiles/h5diff_422.txt | 5 +- tools/h5diff/testfiles/h5diff_423.txt | 5 +- tools/h5diff/testfiles/h5diff_424.txt | 5 +- tools/h5diff/testfiles/h5diff_425.txt | 5 +- tools/h5diff/testfiles/h5diff_450.txt | 35 + tools/h5diff/testfiles/h5diff_451.txt | 28 + tools/h5diff/testfiles/h5diff_452.txt | 2 + tools/h5diff/testfiles/h5diff_453.txt | 47 ++ tools/h5diff/testfiles/h5diff_454.txt | 2 + tools/h5diff/testfiles/h5diff_455.txt | 2 + tools/h5diff/testfiles/h5diff_456.txt | 32 + tools/h5diff/testfiles/h5diff_457.txt | 2 + tools/h5diff/testfiles/h5diff_458.txt | 2 + tools/h5diff/testfiles/h5diff_459.txt | 2 + tools/h5diff/testfiles/h5diff_50.txt | 1 + tools/h5diff/testfiles/h5diff_51.txt | 1 + tools/h5diff/testfiles/h5diff_52.txt | 1 + tools/h5diff/testfiles/h5diff_53.txt | 1 + tools/h5diff/testfiles/h5diff_54.txt | 1 + tools/h5diff/testfiles/h5diff_55.txt | 1 + tools/h5diff/testfiles/h5diff_56.txt | 1 + tools/h5diff/testfiles/h5diff_57.txt | 1 + tools/h5diff/testfiles/h5diff_58.txt | 1 + tools/h5diff/testfiles/h5diff_600.txt | 99 ++- tools/h5diff/testfiles/h5diff_603.txt | 99 ++- tools/h5diff/testfiles/h5diff_604.txt | 1 + tools/h5diff/testfiles/h5diff_605.txt | 1 + tools/h5diff/testfiles/h5diff_606.txt | 99 ++- tools/h5diff/testfiles/h5diff_607.txt | 1 + tools/h5diff/testfiles/h5diff_608.txt | 1 + tools/h5diff/testfiles/h5diff_609.txt | 1 + tools/h5diff/testfiles/h5diff_610.txt | 1 + tools/h5diff/testfiles/h5diff_612.txt | 99 ++- tools/h5diff/testfiles/h5diff_613.txt | 1 + tools/h5diff/testfiles/h5diff_614.txt | 1 + tools/h5diff/testfiles/h5diff_615.txt | 99 ++- tools/h5diff/testfiles/h5diff_616.txt | 1 + tools/h5diff/testfiles/h5diff_617.txt | 1 + tools/h5diff/testfiles/h5diff_618.txt | 1 + tools/h5diff/testfiles/h5diff_619.txt | 1 + tools/h5diff/testfiles/h5diff_621.txt | 99 ++- tools/h5diff/testfiles/h5diff_622.txt | 99 ++- tools/h5diff/testfiles/h5diff_623.txt | 99 ++- tools/h5diff/testfiles/h5diff_624.txt | 99 ++- tools/h5diff/testfiles/h5diff_625.txt | 1 + tools/h5diff/testfiles/h5diff_626.txt | 1 + tools/h5diff/testfiles/h5diff_627.txt | 1 + tools/h5diff/testfiles/h5diff_628.txt | 1 + tools/h5diff/testfiles/h5diff_629.txt | 1 + tools/h5diff/testfiles/h5diff_70.txt | 1 + tools/h5diff/testfiles/h5diff_80.txt | 1 + tools/h5diff/testfiles/h5diff_90.txt | 1 + tools/h5diff/testfiles/h5diff_danglelinks1.h5 | Bin 0 -> 5012 bytes tools/h5diff/testfiles/h5diff_danglelinks2.h5 | Bin 0 -> 5012 bytes tools/h5diff/testh5diff.sh | 188 ++--- tools/lib/h5diff.c | 1005 ++++++++++++------------- tools/lib/h5diff.h | 3 +- 118 files changed, 1672 insertions(+), 1064 deletions(-) create mode 100644 tools/h5diff/testfiles/h5diff_450.txt create mode 100644 tools/h5diff/testfiles/h5diff_451.txt create mode 100644 tools/h5diff/testfiles/h5diff_452.txt create mode 100644 tools/h5diff/testfiles/h5diff_453.txt create mode 100644 tools/h5diff/testfiles/h5diff_454.txt create mode 100644 tools/h5diff/testfiles/h5diff_455.txt create mode 100644 tools/h5diff/testfiles/h5diff_456.txt create mode 100644 tools/h5diff/testfiles/h5diff_457.txt create mode 100644 tools/h5diff/testfiles/h5diff_458.txt create mode 100644 tools/h5diff/testfiles/h5diff_459.txt create mode 100644 tools/h5diff/testfiles/h5diff_danglelinks1.h5 create mode 100644 tools/h5diff/testfiles/h5diff_danglelinks2.h5 diff --git a/MANIFEST b/MANIFEST index ee2ba15..1071f0a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1548,6 +1548,16 @@ ./tools/h5diff/testfiles/h5diff_423.txt ./tools/h5diff/testfiles/h5diff_424.txt ./tools/h5diff/testfiles/h5diff_425.txt +./tools/h5diff/testfiles/h5diff_450.txt +./tools/h5diff/testfiles/h5diff_451.txt +./tools/h5diff/testfiles/h5diff_452.txt +./tools/h5diff/testfiles/h5diff_453.txt +./tools/h5diff/testfiles/h5diff_454.txt +./tools/h5diff/testfiles/h5diff_455.txt +./tools/h5diff/testfiles/h5diff_456.txt +./tools/h5diff/testfiles/h5diff_457.txt +./tools/h5diff/testfiles/h5diff_458.txt +./tools/h5diff/testfiles/h5diff_459.txt ./tools/h5diff/testfiles/h5diff_attr1.h5 @@ -1568,6 +1578,8 @@ ./tools/h5diff/testfiles/h5diff_extlink_trg.h5 ./tools/h5diff/testfiles/h5diff_linked_softlink.h5 ./tools/h5diff/testfiles/h5diff_softlinks.h5 +./tools/h5diff/testfiles/h5diff_danglelinks1.h5 +./tools/h5diff/testfiles/h5diff_danglelinks2.h5 diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 93a6e68..c845d6c 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -142,8 +142,9 @@ New Features Tools: ------ - - h5diff: Add new flag -l (--link-follow),for comparing through links - (soft and external links along with hard link). + - h5diff: Add new flag --no-dangling-links. (refer to --help for details) + (JKM - 2010/02/10) + - h5diff: Add new flag --follow-links. (refer to --help for details) (JKM - 2010/01/25) - h5diff: fix for displaying garbage value on LE machine for BE data. (JKM - 2009/11/20) diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index 9e3b86e..75e1774 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -31,7 +31,7 @@ const char *progname = "h5diff"; * Command-line options: The user can specify short or long-named * parameters. */ -static const char *s_opts = "hVrvqn:d:p:Ncl"; +static const char *s_opts = "hVrvqn:d:p:Nc"; static struct long_options l_opts[] = { { "help", no_arg, 'h' }, { "version", no_arg, 'V' }, @@ -44,7 +44,8 @@ static struct long_options l_opts[] = { { "nan", no_arg, 'N' }, { "compare", no_arg, 'c' }, { "use-system-epsilon", no_arg, 'e' }, - { "link-follow", no_arg, 'l' }, + { "follow-links", no_arg, 'l' }, + { "no-dangling-links", no_arg, 'x' }, { NULL, 0, '\0' } }; @@ -102,7 +103,10 @@ void parse_command_line(int argc, options->m_report = 1; break; case 'l': - options->linkfollow = 1; + options->follow_links = 1; + break; + case 'x': + options->no_dangle_links = 1; break; case 'd': options->d=1; @@ -356,33 +360,68 @@ void usage(void) 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 Print a usage message and exit\n"); - printf(" -V, --version Print version number and exit\n"); - printf(" -r, --report Report mode. Print differences\n"); - printf(" -v, --verbose Verbose mode. Print differences, list of objects\n"); - printf(" -q, --quiet Quiet mode. Do not do output\n"); - printf(" -l, --link-follow Follow link(s)\n"); + printf(" -h, --help Print a usage message and exit.\n"); + printf(" -V, --version Print version number and exit.\n"); + printf(" -r, --report Report mode. Print differences.\n"); + printf(" -v, --verbose Verbose mode. Print differences, list of objects.\n"); + printf(" -q, --quiet Quiet mode. Do not produce output.\n"); + printf(" --follow-links Follow symbolic links (soft links and external links)\n"); + printf(" and compare the links' target objects.\n"); + printf(" If symbolic link(s) with the same name exist in the\n"); + printf(" files being compared, then determine whether the \n"); + printf(" target of each link is an existing object (dataset,\n"); + printf(" group, or named datatype) or the link is a dangling\n"); + printf(" link (a soft or external link pointing to a target\n"); + printf(" object that does not yet exist).\n"); + printf(" - If both symbolic links are dangling links, they\n"); + printf(" are treated as being the same; by default, h5diff\n"); + printf(" returns an exit code of 0. If, however, \n"); + printf(" --no-dangling-links is used with --follow-links, \n"); + printf(" this situation is treated as an error and h5diff \n"); + printf(" returns an exit code of 2.\n"); + printf(" - If only one of the two links is a dangling link,\n"); + printf(" they are treated as being different and h5diff \n"); + printf(" returns an exit code of 1. If, however, \n"); + printf(" --no-dangling-links is used with --follow-links, \n"); + printf(" this situation is treated as an error and h5diff \n"); + printf(" returns an exit code of 2.\n"); + printf(" - If both symbolic links point to existing objects,\n"); + printf(" h5diff compares the two objects.\n"); + printf(" If any symbolic link specified in the call to h5diff\n"); + printf(" does not exist, h5diff treats it as an error and\n"); + printf(" returns an exit code of 2.\n"); + printf(" --no-dangling-links Must be used with --follow-links option;\n"); + printf(" otherwise, h5diff shows error message and returns\n"); + printf(" an exit code of 2.\n"); + printf(" Check for any symbolic links (soft links or external\n"); + printf(" links) that do not resolve to an existing object\n"); + printf(" (dataset, group, or named datatype). If any\n"); + printf(" dangling link is found, this situation is treated as\n"); + printf(" an error and h5diff returns an exit code of 2.\n"); printf(" -c, --compare List objects that are not comparable\n"); printf(" -N, --nan Avoid NaNs detection\n"); - printf(" -n C, --count=C Print differences up to C number, C is a positive integer.\n"); - - printf(" -d D, --delta=D Print difference if (|a-b| > D), D is a positive number.\n"); - printf(" -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number.\n"); + printf(" -n C, --count=C Print differences up to C number, C is a positive\n"); + printf(" integer.\n"); + printf(" -d D, --delta=D Print difference if (|a-b| > D), D is a positive\n"); + printf(" number.\n"); + printf(" -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive\n"); + printf(" number.\n"); printf(" --use-system-epsilon Print difference if (|a-b| > EPSILON),\n"); - printf(" where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. \n"); - printf(" If the system epsilon is not defined, use the value below:\n"); + printf(" where EPSILON (FLT_EPSILON or FLT_EPSILON) is the\n"); + printf(" system epsilon value. \n"); + printf(" If the system epsilon is not defined, use the value\n"); + printf(" below:\n"); printf(" FLT_EPSILON = 1.19209E-07 for float\n"); printf(" DBL_EPSILON = 2.22045E-16 for double\n"); - - printf(" -d, -p, and --use-system-epsilon options are used for comparing floating point values.\n"); - printf(" By default, strict equality is used. Use -p or -d to set specific tolerance.\n"); + printf(" -d, -p, and --use-system-epsilon options are used for\n"); + printf(" comparing floating point values.\n"); + printf(" By default, strict equality is used. Use -p or -d to\n"); + printf(" set specific tolerance.\n"); printf("\n"); printf(" Modes of output:\n"); - printf("\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"); @@ -391,46 +430,35 @@ void usage(void) printf("\n"); printf(" Compare criteria\n"); - printf("\n"); - printf(" If no objects [obj1[obj2]] are specified, h5diff only compares objects\n"); - printf(" with the same absolute path in both files\n"); + printf(" If no objects [obj1[obj2]] are specified, h5diff only compares objects\n"); + printf(" with the same absolute path in both files\n"); printf("\n"); printf(" The compare criteria is:\n"); - printf(" 1) datasets: numerical array differences 2) groups: name string difference\n"); - printf(" 3) datatypes: the return value of H5Tequal 4) links: name string difference\n"); - printf(" of the linked value\n"); - + printf(" 1) datasets: numerical array differences\n"); + printf(" 2) groups: name string difference\n"); + printf(" 3) datatypes: the return value of H5Tequal\n"); + printf(" 4) links: name string difference of the linked value as default\n"); + printf(" (refer to --follow-links option).\n"); printf("\n"); - - printf(" Return exit code:\n"); + printf(" Exit code:\n"); + printf(" 0 if no differences, 1 if differences found, 2 if error\n"); printf("\n"); - printf(" 1 if differences found, 0 if no differences, 2 if error\n"); - - printf("\n"); - printf(" Examples of use:\n"); - printf("\n"); printf(" 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n"); - printf("\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("\n"); printf(" Compares object '/g1/dset1' in both files\n"); printf("\n"); printf(" 3) h5diff file1 file2\n"); - printf("\n"); printf(" Compares all objects in both files\n"); printf("\n"); - printf(" Note) file1 and file2 can be the same file. Use\n"); - printf("\n"); - printf(" h5diff file1 file1 /g1/dset1 /g1/dset2\n"); - printf("\n"); - printf(" to compare '/g1/dset1' and '/g1/dset2' in the same file\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"); - - } diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c index 1cb8f2f..6f33bb0 100644 --- a/tools/h5diff/h5diff_main.c +++ b/tools/h5diff/h5diff_main.c @@ -88,6 +88,25 @@ int main(int argc, const char *argv[]) parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options); + /*------------------------------------------------------------------------- + * check invalid combination of options + *-----------------------------------------------------------------------*/ + /* no -q(quiet) with -v (verbose) or -r (report) */ + if(options.m_quiet && (options.m_verbose || options.m_report)) + { + parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n"); + options.err_stat=1; + goto out; + } + + /* only allow --no-dangling-links along with --follow-links */ + if(options.no_dangle_links && !options.follow_links) + { + parallel_print("Error: --no-dangling-links must be used along with --follow-links option.\n"); + options.err_stat=1; + goto out; + } + /*------------------------------------------------------------------------- * do the diff *------------------------------------------------------------------------- @@ -97,6 +116,7 @@ int main(int argc, const char *argv[]) print_info(&options); +out: /*------------------------------------------------------------------------- * exit code * 1 if differences, 0 if no differences, 2 if error diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt index a6b637a..aeba845 100644 --- a/tools/h5diff/testfiles/h5diff_10.txt +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -3,64 +3,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_100.txt b/tools/h5diff/testfiles/h5diff_100.txt index 32ff7ab..363daa3 100644 --- a/tools/h5diff/testfiles/h5diff_100.txt +++ b/tools/h5diff/testfiles/h5diff_100.txt @@ -1035,3 +1035,4 @@ position big big difference [ 268436478 ] 31 0 31 [ 268436479 ] 31 0 31 1024 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt index 03875b7..1d0f38d 100644 --- a/tools/h5diff/testfiles/h5diff_101.txt +++ b/tools/h5diff/testfiles/h5diff_101.txt @@ -7,3 +7,4 @@ position d1 d2 difference [ 1 1 ] 0 1e-09 1e-09 [ 2 0 ] 1e-09 0 1e-09 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt index 3d91a36..30a2491 100644 --- a/tools/h5diff/testfiles/h5diff_102.txt +++ b/tools/h5diff/testfiles/h5diff_102.txt @@ -7,3 +7,4 @@ position fp1 fp2 difference [ 1 1 ] 0 1e-05 1e-05 [ 2 0 ] 1e-05 0 1e-05 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_11.txt b/tools/h5diff/testfiles/h5diff_11.txt index e2e33fb..c06305c 100644 --- a/tools/h5diff/testfiles/h5diff_11.txt +++ b/tools/h5diff/testfiles/h5diff_11.txt @@ -1,2 +1,3 @@ dataset: and 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_12.txt b/tools/h5diff/testfiles/h5diff_12.txt index 6b4c747..371df79 100644 --- a/tools/h5diff/testfiles/h5diff_12.txt +++ b/tools/h5diff/testfiles/h5diff_12.txt @@ -1,2 +1,3 @@ dataset: and 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_13.txt b/tools/h5diff/testfiles/h5diff_13.txt index 36676e9..729859b 100644 --- a/tools/h5diff/testfiles/h5diff_13.txt +++ b/tools/h5diff/testfiles/h5diff_13.txt @@ -8,3 +8,4 @@ position dset1 dset1 difference [ 1 1 ] 1 1.001 0.001 [ 2 1 ] 0 1 1 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_14.txt b/tools/h5diff/testfiles/h5diff_14.txt index 3fac3af..454463a 100644 --- a/tools/h5diff/testfiles/h5diff_14.txt +++ b/tools/h5diff/testfiles/h5diff_14.txt @@ -8,3 +8,4 @@ position dset1 dset2 difference [ 1 1 ] 1 1.001 0.001 [ 2 1 ] 0 1 1 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_15.txt b/tools/h5diff/testfiles/h5diff_15.txt index 386c6e1..7685f75 100644 --- a/tools/h5diff/testfiles/h5diff_15.txt +++ b/tools/h5diff/testfiles/h5diff_15.txt @@ -7,3 +7,4 @@ position dset3 dset4 difference [ 2 0 ] 100 80 20 [ 2 1 ] 100 40 60 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_16_1.txt b/tools/h5diff/testfiles/h5diff_16_1.txt index 519f695..482a42f 100644 --- a/tools/h5diff/testfiles/h5diff_16_1.txt +++ b/tools/h5diff/testfiles/h5diff_16_1.txt @@ -8,3 +8,4 @@ position dset5 dset6 difference relative [ 1 1 ] 0 100 100 not comparable [ 2 1 ] 100 50 50 0.500000 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_16_2.txt b/tools/h5diff/testfiles/h5diff_16_2.txt index 233b133..34c1afb 100644 --- a/tools/h5diff/testfiles/h5diff_16_2.txt +++ b/tools/h5diff/testfiles/h5diff_16_2.txt @@ -8,3 +8,4 @@ position dset7 dset8 difference relative [ 1 1 ] 0 100 100 not comparable [ 2 1 ] 100 50 50 0.500000 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_16_3.txt b/tools/h5diff/testfiles/h5diff_16_3.txt index b96c8a4..173a39b 100644 --- a/tools/h5diff/testfiles/h5diff_16_3.txt +++ b/tools/h5diff/testfiles/h5diff_16_3.txt @@ -8,3 +8,4 @@ position dset9 dset10 difference relative [ 1 1 ] 0 100 100 not comparable [ 2 1 ] 100 50 50 0.5 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt index dce5ef5..5cb604d 100644 --- a/tools/h5diff/testfiles/h5diff_17.txt +++ b/tools/h5diff/testfiles/h5diff_17.txt @@ -51,3 +51,4 @@ position dset1 dset1 difference [ 1 1 ] 1 1.001 0.001 [ 2 1 ] 0 1 1 5 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_171.txt b/tools/h5diff/testfiles/h5diff_171.txt index 7ee0711..5314a79 100644 --- a/tools/h5diff/testfiles/h5diff_171.txt +++ b/tools/h5diff/testfiles/h5diff_171.txt @@ -1,2 +1,3 @@ dataset: and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_172.txt b/tools/h5diff/testfiles/h5diff_172.txt index e2d1b7d..0269194 100644 --- a/tools/h5diff/testfiles/h5diff_172.txt +++ b/tools/h5diff/testfiles/h5diff_172.txt @@ -1,2 +1,3 @@ dataset: and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_18.txt b/tools/h5diff/testfiles/h5diff_18.txt index e69de29..1255241 100644 --- a/tools/h5diff/testfiles/h5diff_18.txt +++ b/tools/h5diff/testfiles/h5diff_18.txt @@ -0,0 +1 @@ +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_19.txt b/tools/h5diff/testfiles/h5diff_19.txt index 9e84fe8..1155d55 100644 --- a/tools/h5diff/testfiles/h5diff_19.txt +++ b/tools/h5diff/testfiles/h5diff_19.txt @@ -23,3 +23,4 @@ file1 file2 group : and 0 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt index b2fda7c..6eba851 100644 --- a/tools/h5diff/testfiles/h5diff_20.txt +++ b/tools/h5diff/testfiles/h5diff_20.txt @@ -3,3 +3,4 @@ Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_200.txt b/tools/h5diff/testfiles/h5diff_200.txt index 56d723d..40e3fb6 100644 --- a/tools/h5diff/testfiles/h5diff_200.txt +++ b/tools/h5diff/testfiles/h5diff_200.txt @@ -2,3 +2,4 @@ Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_201.txt b/tools/h5diff/testfiles/h5diff_201.txt index 84d6766..ede94e1 100644 --- a/tools/h5diff/testfiles/h5diff_201.txt +++ b/tools/h5diff/testfiles/h5diff_201.txt @@ -1 +1,2 @@ Not comparable: or is an empty dataset +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt index fd4a191..53657d3 100644 --- a/tools/h5diff/testfiles/h5diff_202.txt +++ b/tools/h5diff/testfiles/h5diff_202.txt @@ -1,2 +1,3 @@ Not comparable: is of class H5T_FLOAT and is of class H5T_INTEGER Not comparable: has sign H5T_SGN_ERROR and has sign H5T_SGN_2 +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_203.txt b/tools/h5diff/testfiles/h5diff_203.txt index 496523c..61a773a 100644 --- a/tools/h5diff/testfiles/h5diff_203.txt +++ b/tools/h5diff/testfiles/h5diff_203.txt @@ -1,2 +1,3 @@ Not comparable: has rank 1, dimensions [6], max dimensions [6] and has rank 2, dimensions [3x2], max dimensions [3x2] +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_204.txt b/tools/h5diff/testfiles/h5diff_204.txt index 098a203..e02e831 100644 --- a/tools/h5diff/testfiles/h5diff_204.txt +++ b/tools/h5diff/testfiles/h5diff_204.txt @@ -1,2 +1,3 @@ Not comparable: has rank 2, dimensions [3x2], max dimensions [3x2] and has rank 2, dimensions [2x2], max dimensions [2x2] +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_205.txt b/tools/h5diff/testfiles/h5diff_205.txt index 3e2d1f2..d72797b 100644 --- a/tools/h5diff/testfiles/h5diff_205.txt +++ b/tools/h5diff/testfiles/h5diff_205.txt @@ -1,3 +1,4 @@ Not comparable: has rank 2, dimensions [2x2], max dimensions [2x2] and has rank 2, dimensions [3x2], max dimensions [3x2] Not comparable: has sign H5T_SGN_2 and has sign H5T_SGN_NONE +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_206.txt b/tools/h5diff/testfiles/h5diff_206.txt index 164aed9..659321f 100644 --- a/tools/h5diff/testfiles/h5diff_206.txt +++ b/tools/h5diff/testfiles/h5diff_206.txt @@ -1 +1,2 @@ Not comparable: has a class H5T_FLOAT and has a class H5T_INTEGER +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_207.txt b/tools/h5diff/testfiles/h5diff_207.txt index bb8e23f..1ef3dbe 100644 --- a/tools/h5diff/testfiles/h5diff_207.txt +++ b/tools/h5diff/testfiles/h5diff_207.txt @@ -1,2 +1,3 @@ Not comparable: or is an empty dataset Not comparable: has 2 members has 1 members +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt index 5518e0c..238c8b8 100644 --- a/tools/h5diff/testfiles/h5diff_21.txt +++ b/tools/h5diff/testfiles/h5diff_21.txt @@ -3,3 +3,4 @@ Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt index 0f9493b..33c3a3d 100644 --- a/tools/h5diff/testfiles/h5diff_22.txt +++ b/tools/h5diff/testfiles/h5diff_22.txt @@ -3,3 +3,4 @@ Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_23.txt b/tools/h5diff/testfiles/h5diff_23.txt index 1342765..5a46ea2 100644 --- a/tools/h5diff/testfiles/h5diff_23.txt +++ b/tools/h5diff/testfiles/h5diff_23.txt @@ -1,2 +1,3 @@ group : and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_24.txt b/tools/h5diff/testfiles/h5diff_24.txt index cc4f0d0..fa5723a 100644 --- a/tools/h5diff/testfiles/h5diff_24.txt +++ b/tools/h5diff/testfiles/h5diff_24.txt @@ -1,2 +1,3 @@ datatype: and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_25.txt b/tools/h5diff/testfiles/h5diff_25.txt index 288c4da..e463ba1 100644 --- a/tools/h5diff/testfiles/h5diff_25.txt +++ b/tools/h5diff/testfiles/h5diff_25.txt @@ -1,2 +1,3 @@ link : and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt index 916cf63..8e1fcc3 100644 --- a/tools/h5diff/testfiles/h5diff_26.txt +++ b/tools/h5diff/testfiles/h5diff_26.txt @@ -1,2 +1,3 @@ group : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_27.txt b/tools/h5diff/testfiles/h5diff_27.txt index 335119a..cbc128e 100644 --- a/tools/h5diff/testfiles/h5diff_27.txt +++ b/tools/h5diff/testfiles/h5diff_27.txt @@ -1,2 +1,3 @@ datatype: and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_28.txt b/tools/h5diff/testfiles/h5diff_28.txt index 5845fa9..07d01fe 100644 --- a/tools/h5diff/testfiles/h5diff_28.txt +++ b/tools/h5diff/testfiles/h5diff_28.txt @@ -1,2 +1,3 @@ link : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_300.txt b/tools/h5diff/testfiles/h5diff_300.txt index 0cfc01b..e51643f 100755 --- a/tools/h5diff/testfiles/h5diff_300.txt +++ b/tools/h5diff/testfiles/h5diff_300.txt @@ -1,2 +1,3 @@ link : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_400.txt b/tools/h5diff/testfiles/h5diff_400.txt index 4b910f5..97db70d 100644 --- a/tools/h5diff/testfiles/h5diff_400.txt +++ b/tools/h5diff/testfiles/h5diff_400.txt @@ -16,29 +16,26 @@ file1 file2 group : and 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found -warn: link target "/no_obj" doesn't exist -warn: link target "/no_obj" doesn't exist -link : and -Comparison not supported: and are of type unknown type +dangling link: and 0 differences found dataset: and 0 differences found @@ -48,7 +45,4 @@ group : and 0 differences found dataset: and 0 differences found --------------------------------- -Some objects are not comparable --------------------------------- -Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_401.txt b/tools/h5diff/testfiles/h5diff_401.txt index 5c599e3..278729e 100644 --- a/tools/h5diff/testfiles/h5diff_401.txt +++ b/tools/h5diff/testfiles/h5diff_401.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position target_dset1 target_dset2 difference +position softlink_dset1_1 target_dset2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position target_dset1 target_dset2 difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_402.txt b/tools/h5diff/testfiles/h5diff_402.txt index 228c8cc..b0f30ca 100644 --- a/tools/h5diff/testfiles/h5diff_402.txt +++ b/tools/h5diff/testfiles/h5diff_402.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position target_dset2 target_dset1 difference +position target_dset2 softlink_dset1_1 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position target_dset2 target_dset1 difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_403.txt b/tools/h5diff/testfiles/h5diff_403.txt index 5c599e3..068d01d 100644 --- a/tools/h5diff/testfiles/h5diff_403.txt +++ b/tools/h5diff/testfiles/h5diff_403.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position target_dset1 target_dset2 difference +position softlink_dset1_1 softlink_dset2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position target_dset1 target_dset2 difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_404.txt b/tools/h5diff/testfiles/h5diff_404.txt index 2a0b856..c9a476d 100644 --- a/tools/h5diff/testfiles/h5diff_404.txt +++ b/tools/h5diff/testfiles/h5diff_404.txt @@ -12,25 +12,23 @@ file1 file2 group : and 0 differences found external link: and -dataset: and +dataset: and 0 differences found 0 differences found external link: and -dataset: and +dataset: and 0 differences found 0 differences found external link: and -group : and +group : and 0 differences found 0 differences found external link: and -group : and +group : and 0 differences found 0 differences found -external link: and -Object could not be found in -Object could not be found in +dangling link: and 0 differences found -external link: and -h5diff: : unable to open file +dangling link: and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_405.txt b/tools/h5diff/testfiles/h5diff_405.txt index edbf22a..890dd33 100644 --- a/tools/h5diff/testfiles/h5diff_405.txt +++ b/tools/h5diff/testfiles/h5diff_405.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position x_dset x_dset difference +position ext_link_dset1 x_dset difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position x_dset x_dset difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_406.txt b/tools/h5diff/testfiles/h5diff_406.txt index 7c5eb3e..7fa442a 100644 --- a/tools/h5diff/testfiles/h5diff_406.txt +++ b/tools/h5diff/testfiles/h5diff_406.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position x_dset x_dset difference +position x_dset ext_link_dset1 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position x_dset x_dset difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_407.txt b/tools/h5diff/testfiles/h5diff_407.txt index edbf22a..3693ab9 100644 --- a/tools/h5diff/testfiles/h5diff_407.txt +++ b/tools/h5diff/testfiles/h5diff_407.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position x_dset x_dset difference +position ext_link_dset1 ext_link_dset2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position x_dset x_dset difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_408.txt b/tools/h5diff/testfiles/h5diff_408.txt index 11a928a..e941f9b 100644 --- a/tools/h5diff/testfiles/h5diff_408.txt +++ b/tools/h5diff/testfiles/h5diff_408.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position target_dset1 x_dset difference +position softlink_dset1_1 ext_link_dset2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position target_dset1 x_dset difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_409.txt b/tools/h5diff/testfiles/h5diff_409.txt index 3b95e7c..007da7d 100644 --- a/tools/h5diff/testfiles/h5diff_409.txt +++ b/tools/h5diff/testfiles/h5diff_409.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position x_dset target_dset1 difference +position ext_link_dset2 softlink_dset1_1 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position x_dset target_dset1 difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_410.txt b/tools/h5diff/testfiles/h5diff_410.txt index 8c645d2..b0924f6 100644 --- a/tools/h5diff/testfiles/h5diff_410.txt +++ b/tools/h5diff/testfiles/h5diff_410.txt @@ -24,51 +24,51 @@ file1 file2 group : and 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -dataset: and +dataset: and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found link : and -group : and +group : and 0 differences found 0 differences found dataset: and @@ -83,3 +83,4 @@ group : and 0 differences found group : and 0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_411.txt b/tools/h5diff/testfiles/h5diff_411.txt index 2775677..161ab34 100644 --- a/tools/h5diff/testfiles/h5diff_411.txt +++ b/tools/h5diff/testfiles/h5diff_411.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position target_dset2 softlink1_to_slink1 difference +position target_dset2 softlink1_to_slink2 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position target_dset2 softlink1_to_slink1 difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_412.txt b/tools/h5diff/testfiles/h5diff_412.txt index 0924099..bb8209c 100644 --- a/tools/h5diff/testfiles/h5diff_412.txt +++ b/tools/h5diff/testfiles/h5diff_412.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position softlink1_to_slink1 target_dset2 difference +position softlink1_to_slink2 target_dset2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position softlink1_to_slink1 target_dset2 difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_413.txt b/tools/h5diff/testfiles/h5diff_413.txt index ae6cfea..8df3d51 100644 --- a/tools/h5diff/testfiles/h5diff_413.txt +++ b/tools/h5diff/testfiles/h5diff_413.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position softlink1_to_slink1 softlink2_to_slink1 difference +position softlink1_to_slink2 softlink2_to_slink2 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position softlink1_to_slink1 softlink2_to_slink1 difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_414.txt b/tools/h5diff/testfiles/h5diff_414.txt index 0f07a14..e7a991a 100644 --- a/tools/h5diff/testfiles/h5diff_414.txt +++ b/tools/h5diff/testfiles/h5diff_414.txt @@ -1,2 +1,3 @@ -group : and +group : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_415.txt b/tools/h5diff/testfiles/h5diff_415.txt index 3a9d863..1e97319 100644 --- a/tools/h5diff/testfiles/h5diff_415.txt +++ b/tools/h5diff/testfiles/h5diff_415.txt @@ -1,2 +1,3 @@ -group : and +group : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_416.txt b/tools/h5diff/testfiles/h5diff_416.txt index 39d88bc..e4e98b0 100644 --- a/tools/h5diff/testfiles/h5diff_416.txt +++ b/tools/h5diff/testfiles/h5diff_416.txt @@ -1,2 +1,3 @@ -group : and +group : and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_417.txt b/tools/h5diff/testfiles/h5diff_417.txt index 56031e9..0ea2542 100644 --- a/tools/h5diff/testfiles/h5diff_417.txt +++ b/tools/h5diff/testfiles/h5diff_417.txt @@ -1,6 +1,3 @@ -warn: link target "/no_obj" doesn't exist - is of type unknown type and is of type H5G_DATASET --------------------------------- -Some objects are not comparable --------------------------------- -Use -c for a list of objects. +obj1 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_418.txt b/tools/h5diff/testfiles/h5diff_418.txt index 0222174..46222bb 100644 --- a/tools/h5diff/testfiles/h5diff_418.txt +++ b/tools/h5diff/testfiles/h5diff_418.txt @@ -1,6 +1,3 @@ -warn: link target "/no_obj" doesn't exist - is of type H5G_DATASET and is of type unknown type --------------------------------- -Some objects are not comparable --------------------------------- -Use -c for a list of objects. +obj2 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_419.txt b/tools/h5diff/testfiles/h5diff_419.txt index 836e95f..387c600 100644 --- a/tools/h5diff/testfiles/h5diff_419.txt +++ b/tools/h5diff/testfiles/h5diff_419.txt @@ -1,2 +1,3 @@ -error: : unable to open file -error: unable to get external link info from "/ext_link_noexist2" +obj1 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_420.txt b/tools/h5diff/testfiles/h5diff_420.txt index 836e95f..f3e65d9 100644 --- a/tools/h5diff/testfiles/h5diff_420.txt +++ b/tools/h5diff/testfiles/h5diff_420.txt @@ -1,2 +1,3 @@ -error: : unable to open file -error: unable to get external link info from "/ext_link_noexist2" +obj2 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_421.txt b/tools/h5diff/testfiles/h5diff_421.txt index c686b69..833c60c 100644 --- a/tools/h5diff/testfiles/h5diff_421.txt +++ b/tools/h5diff/testfiles/h5diff_421.txt @@ -1,2 +1,3 @@ -error: "/no_obj" doesn't exist -error: unable to get external link info from "/ext_link_noexist1" +obj2 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_422.txt b/tools/h5diff/testfiles/h5diff_422.txt index c686b69..3e675d5 100644 --- a/tools/h5diff/testfiles/h5diff_422.txt +++ b/tools/h5diff/testfiles/h5diff_422.txt @@ -1,2 +1,3 @@ -error: "/no_obj" doesn't exist -error: unable to get external link info from "/ext_link_noexist1" +obj1 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_423.txt b/tools/h5diff/testfiles/h5diff_423.txt index 5eb6766..1ebc157 100644 --- a/tools/h5diff/testfiles/h5diff_423.txt +++ b/tools/h5diff/testfiles/h5diff_423.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position dset1 dset2 difference +position ext_link_to_slink1 dset2 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position dset1 dset2 difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_424.txt b/tools/h5diff/testfiles/h5diff_424.txt index cd240cf..9099c41 100644 --- a/tools/h5diff/testfiles/h5diff_424.txt +++ b/tools/h5diff/testfiles/h5diff_424.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position dset2 dset1 difference +position dset2 ext_link_to_slink1 difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 [ 0 2 ] 2 0 2 @@ -10,3 +10,4 @@ position dset2 dset1 difference [ 1 2 ] 3 0 3 [ 1 3 ] 4 0 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_425.txt b/tools/h5diff/testfiles/h5diff_425.txt index 5eb6766..03ceb78 100644 --- a/tools/h5diff/testfiles/h5diff_425.txt +++ b/tools/h5diff/testfiles/h5diff_425.txt @@ -1,6 +1,6 @@ -dataset: and +dataset: and size: [2x4] [2x4] -position dset1 dset2 difference +position ext_link_to_slink1 ext_link_to_slink2 difference ------------------------------------------------------------ [ 0 1 ] 0 1 1 [ 0 2 ] 0 2 2 @@ -10,3 +10,4 @@ position dset1 dset2 difference [ 1 2 ] 0 3 3 [ 1 3 ] 0 4 4 7 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_450.txt b/tools/h5diff/testfiles/h5diff_450.txt new file mode 100644 index 0000000..bf4f6e9 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_450.txt @@ -0,0 +1,35 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + x x /dset2 + x x /ext_link1 + x x /ext_link2 + x x /ext_link3 + x x /ext_link4 + x x /soft_link1 + x x /soft_link2 + x x /soft_link3 + +group : and +0 differences found +dataset: and +0 differences found +dataset: and +0 differences found +dangling link: and +0 differences found +obj2 is a dangling link. +1 differences found +obj1 is a dangling link. +1 differences found +dangling link: and +0 differences found +dangling link: and +0 differences found +obj2 is a dangling link. +1 differences found +obj1 is a dangling link. +1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_451.txt b/tools/h5diff/testfiles/h5diff_451.txt new file mode 100644 index 0000000..0d30023 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_451.txt @@ -0,0 +1,28 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + x x /dset2 + x x /ext_link1 + x x /ext_link2 + x x /ext_link3 + x x /ext_link4 + x x /soft_link1 + x x /soft_link2 + x x /soft_link3 + +group : and +0 differences found +dataset: and +0 differences found +dataset: and +0 differences found +Warning: is a dangling link. +Warning: is a dangling link. +Warning: is a dangling link. +Warning: is a dangling link. +Warning: is a dangling link. +Warning: is a dangling link. +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_452.txt b/tools/h5diff/testfiles/h5diff_452.txt new file mode 100644 index 0000000..76e4457 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_452.txt @@ -0,0 +1,2 @@ +Error: --no-dangling-links must be used along with --follow-links option. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_453.txt b/tools/h5diff/testfiles/h5diff_453.txt new file mode 100644 index 0000000..9c4d61b --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_453.txt @@ -0,0 +1,47 @@ + +file1 file2 +--------------------------------------- + x x / + x x /softlink_dset1_1 + x x /softlink_dset1_2 + x x /softlink_dset2 + x x /softlink_group1 + x x /softlink_group2 + x x /softlink_noexist + x x /target_dset1 + x x /target_dset2 + x x /target_group + x x /target_group/dset + +group : and +0 differences found +link : and +dataset: and +0 differences found +0 differences found +link : and +dataset: and +0 differences found +0 differences found +link : and +dataset: and +0 differences found +0 differences found +link : and +group : and +0 differences found +0 differences found +link : and +group : and +0 differences found +0 differences found +Warning: is a dangling link. +dataset: and +0 differences found +dataset: and +0 differences found +group : and +0 differences found +dataset: and +0 differences found +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_454.txt b/tools/h5diff/testfiles/h5diff_454.txt new file mode 100644 index 0000000..dcc2e9c --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_454.txt @@ -0,0 +1,2 @@ +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_455.txt b/tools/h5diff/testfiles/h5diff_455.txt new file mode 100644 index 0000000..dcc2e9c --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_455.txt @@ -0,0 +1,2 @@ +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_456.txt b/tools/h5diff/testfiles/h5diff_456.txt new file mode 100644 index 0000000..f20e403 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_456.txt @@ -0,0 +1,32 @@ + +file1 file2 +--------------------------------------- + x x / + x x /ext_link_dset1 + x x /ext_link_dset2 + x x /ext_link_grp1 + x x /ext_link_grp2 + x x /ext_link_noexist1 + x x /ext_link_noexist2 + +group : and +0 differences found +external link: and +dataset: and +0 differences found +0 differences found +external link: and +dataset: and +0 differences found +0 differences found +external link: and +group : and +0 differences found +0 differences found +external link: and +group : and +0 differences found +0 differences found +Warning: is a dangling link. +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_457.txt b/tools/h5diff/testfiles/h5diff_457.txt new file mode 100644 index 0000000..762ccdc --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_457.txt @@ -0,0 +1,2 @@ +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_458.txt b/tools/h5diff/testfiles/h5diff_458.txt new file mode 100644 index 0000000..067d665 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_458.txt @@ -0,0 +1,2 @@ +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_459.txt b/tools/h5diff/testfiles/h5diff_459.txt new file mode 100644 index 0000000..762ccdc --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_459.txt @@ -0,0 +1,2 @@ +Warning: is a dangling link. +EXIT CODE: 2 diff --git a/tools/h5diff/testfiles/h5diff_50.txt b/tools/h5diff/testfiles/h5diff_50.txt index 65b563c..434b458 100644 --- a/tools/h5diff/testfiles/h5diff_50.txt +++ b/tools/h5diff/testfiles/h5diff_50.txt @@ -10,3 +10,4 @@ position dset0a dset0b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_51.txt b/tools/h5diff/testfiles/h5diff_51.txt index e6402cc..621ba2a 100644 --- a/tools/h5diff/testfiles/h5diff_51.txt +++ b/tools/h5diff/testfiles/h5diff_51.txt @@ -7,3 +7,4 @@ position dset1a dset1b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_52.txt b/tools/h5diff/testfiles/h5diff_52.txt index 88febb9..6667659 100644 --- a/tools/h5diff/testfiles/h5diff_52.txt +++ b/tools/h5diff/testfiles/h5diff_52.txt @@ -7,3 +7,4 @@ position dset2a dset2b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_53.txt b/tools/h5diff/testfiles/h5diff_53.txt index 554d71a..458d166 100644 --- a/tools/h5diff/testfiles/h5diff_53.txt +++ b/tools/h5diff/testfiles/h5diff_53.txt @@ -7,3 +7,4 @@ position dset3a dset4b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_54.txt b/tools/h5diff/testfiles/h5diff_54.txt index 1e8adfd..2ca60f8 100644 --- a/tools/h5diff/testfiles/h5diff_54.txt +++ b/tools/h5diff/testfiles/h5diff_54.txt @@ -7,3 +7,4 @@ position dset4a dset4b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_55.txt b/tools/h5diff/testfiles/h5diff_55.txt index f895955..1288887 100644 --- a/tools/h5diff/testfiles/h5diff_55.txt +++ b/tools/h5diff/testfiles/h5diff_55.txt @@ -7,3 +7,4 @@ position dset5a dset5b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_56.txt b/tools/h5diff/testfiles/h5diff_56.txt index 402db43..0e82860 100644 --- a/tools/h5diff/testfiles/h5diff_56.txt +++ b/tools/h5diff/testfiles/h5diff_56.txt @@ -7,3 +7,4 @@ position dset6a dset6b difference [ 2 0 ] 1 5 4 [ 2 1 ] 1 6 5 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt index a026077..61aaa57 100644 --- a/tools/h5diff/testfiles/h5diff_57.txt +++ b/tools/h5diff/testfiles/h5diff_57.txt @@ -8,3 +8,4 @@ Not comparable: has sign H5T_SGN_2 and has sign H5T_SGN_NONE Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_58.txt b/tools/h5diff/testfiles/h5diff_58.txt index c46cad3..768dd97 100644 --- a/tools/h5diff/testfiles/h5diff_58.txt +++ b/tools/h5diff/testfiles/h5diff_58.txt @@ -8,3 +8,4 @@ point #1 (2,2) (3,3) point #3 (1,6) (2,5) point #4 (2,8) (1,7) 4 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt index 376e530..f76d4d5 100644 --- a/tools/h5diff/testfiles/h5diff_600.txt +++ b/tools/h5diff/testfiles/h5diff_600.txt @@ -3,65 +3,100 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file h5diff error: missing file names +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt index f8a858d..a5286df 100644 --- a/tools/h5diff/testfiles/h5diff_603.txt +++ b/tools/h5diff/testfiles/h5diff_603.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_604.txt +++ b/tools/h5diff/testfiles/h5diff_604.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_605.txt +++ b/tools/h5diff/testfiles/h5diff_605.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt index ab317bd..ab8039e 100644 --- a/tools/h5diff/testfiles/h5diff_606.txt +++ b/tools/h5diff/testfiles/h5diff_606.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_607.txt b/tools/h5diff/testfiles/h5diff_607.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_607.txt +++ b/tools/h5diff/testfiles/h5diff_607.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_608.txt b/tools/h5diff/testfiles/h5diff_608.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_608.txt +++ b/tools/h5diff/testfiles/h5diff_608.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt index e69de29..eca5994 100644 --- a/tools/h5diff/testfiles/h5diff_609.txt +++ b/tools/h5diff/testfiles/h5diff_609.txt @@ -0,0 +1 @@ +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_610.txt b/tools/h5diff/testfiles/h5diff_610.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_610.txt +++ b/tools/h5diff/testfiles/h5diff_610.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt index 875e17e..686ff15 100644 --- a/tools/h5diff/testfiles/h5diff_612.txt +++ b/tools/h5diff/testfiles/h5diff_612.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_613.txt +++ b/tools/h5diff/testfiles/h5diff_613.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_614.txt +++ b/tools/h5diff/testfiles/h5diff_614.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt index 258124a..cf779c5 100644 --- a/tools/h5diff/testfiles/h5diff_615.txt +++ b/tools/h5diff/testfiles/h5diff_615.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_616.txt b/tools/h5diff/testfiles/h5diff_616.txt index 47a1364..3bc194a 100644 --- a/tools/h5diff/testfiles/h5diff_616.txt +++ b/tools/h5diff/testfiles/h5diff_616.txt @@ -1,2 +1,3 @@ dataset: and 2 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_617.txt b/tools/h5diff/testfiles/h5diff_617.txt index 47a1364..3bc194a 100644 --- a/tools/h5diff/testfiles/h5diff_617.txt +++ b/tools/h5diff/testfiles/h5diff_617.txt @@ -1,2 +1,3 @@ dataset: and 2 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt index e69de29..eca5994 100644 --- a/tools/h5diff/testfiles/h5diff_618.txt +++ b/tools/h5diff/testfiles/h5diff_618.txt @@ -0,0 +1 @@ +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_619.txt b/tools/h5diff/testfiles/h5diff_619.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_619.txt +++ b/tools/h5diff/testfiles/h5diff_619.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt index 1fd7f08..041bb7b 100644 --- a/tools/h5diff/testfiles/h5diff_621.txt +++ b/tools/h5diff/testfiles/h5diff_621.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt index bf15c2a..923bab5 100644 --- a/tools/h5diff/testfiles/h5diff_622.txt +++ b/tools/h5diff/testfiles/h5diff_622.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt index 5186dcc..405a211 100644 --- a/tools/h5diff/testfiles/h5diff_623.txt +++ b/tools/h5diff/testfiles/h5diff_623.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt index d646a25..dc7c83b 100644 --- a/tools/h5diff/testfiles/h5diff_624.txt +++ b/tools/h5diff/testfiles/h5diff_624.txt @@ -4,64 +4,99 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] file2 File name of the second HDF5 file [obj1] Name of an HDF5 object, in absolute path [obj2] Name of an HDF5 object, in absolute path + OPTIONS - -h, --help Print a usage message and exit - -V, --version Print version number and exit - -r, --report Report mode. Print differences - -v, --verbose Verbose mode. Print differences, list of objects - -q, --quiet Quiet mode. Do not do output - -l, --link-follow Follow link(s) + -h, --help Print a usage message and exit. + -V, --version Print version number and exit. + -r, --report Report mode. Print differences. + -v, --verbose Verbose mode. Print differences, list of objects. + -q, --quiet Quiet mode. Do not produce output. + --follow-links Follow symbolic links (soft links and external links) + and compare the links' target objects. + If symbolic link(s) with the same name exist in the + files being compared, then determine whether the + target of each link is an existing object (dataset, + group, or named datatype) or the link is a dangling + link (a soft or external link pointing to a target + object that does not yet exist). + - If both symbolic links are dangling links, they + are treated as being the same; by default, h5diff + returns an exit code of 0. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If only one of the two links is a dangling link, + they are treated as being different and h5diff + returns an exit code of 1. If, however, + --no-dangling-links is used with --follow-links, + this situation is treated as an error and h5diff + returns an exit code of 2. + - If both symbolic links point to existing objects, + h5diff compares the two objects. + If any symbolic link specified in the call to h5diff + does not exist, h5diff treats it as an error and + returns an exit code of 2. + --no-dangling-links Must be used with --follow-links option; + otherwise, h5diff shows error message and returns + an exit code of 2. + Check for any symbolic links (soft links or external + links) that do not resolve to an existing object + (dataset, group, or named datatype). If any + dangling link is found, this situation is treated as + an error and h5diff returns an exit code of 2. -c, --compare List objects that are not comparable -N, --nan Avoid NaNs detection - -n C, --count=C Print differences up to C number, C is a positive integer. - -d D, --delta=D Print difference if (|a-b| > D), D is a positive number. - -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive number. + -n C, --count=C Print differences up to C number, C is a positive + integer. + -d D, --delta=D Print difference if (|a-b| > D), D is a positive + number. + -p R, --relative=R Print difference if (|(a-b)/b| > R), R is a positive + number. --use-system-epsilon Print difference if (|a-b| > EPSILON), - where EPSILON (FLT_EPSILON or FLT_EPSILON) is the system epsilon value. - If the system epsilon is not defined, use the value below: + where EPSILON (FLT_EPSILON or FLT_EPSILON) is the + system epsilon value. + If the system epsilon is not defined, use the value + below: FLT_EPSILON = 1.19209E-07 for float DBL_EPSILON = 2.22045E-16 for double - -d, -p, and --use-system-epsilon options are used for comparing floating point values. - By default, strict equality is used. Use -p or -d to set specific tolerance. + -d, -p, and --use-system-epsilon options are used for + comparing floating point values. + By default, strict equality is used. Use -p or -d to + set specific tolerance. Modes of output: - Default mode: print the number of differences found and where they occured -r Report mode: print the above plus the differences -v Verbose mode: print the above plus a list of objects and warnings -q Quiet mode: do not print output Compare criteria - - If no objects [obj1[obj2]] are specified, h5diff only compares objects - with the same absolute path in both files + If no objects [obj1[obj2]] are specified, h5diff only compares objects + with the same absolute path in both files The compare criteria is: - 1) datasets: numerical array differences 2) groups: name string difference - 3) datatypes: the return value of H5Tequal 4) links: name string difference - of the linked value + 1) datasets: numerical array differences + 2) groups: name string difference + 3) datatypes: the return value of H5Tequal + 4) links: name string difference of the linked value as default + (refer to --follow-links option). - Return exit code: - - 1 if differences found, 0 if no differences, 2 if error + Exit code: + 0 if no differences, 1 if differences found, 2 if error Examples of use: - 1) h5diff file1 file2 /g1/dset1 /g1/dset2 - Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2 2) h5diff file1 file2 /g1/dset1 - Compares object '/g1/dset1' in both files 3) h5diff file1 file2 - Compares all objects in both files - Note) file1 and file2 can be the same file. Use - - h5diff file1 file1 /g1/dset1 /g1/dset2 - - to compare '/g1/dset1' and '/g1/dset2' in the same file + Notes: + file1 and file2 can be the same file. + Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare + '/g1/dset1' and '/g1/dset2' in the same file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_625.txt b/tools/h5diff/testfiles/h5diff_625.txt index 47a1364..3bc194a 100644 --- a/tools/h5diff/testfiles/h5diff_625.txt +++ b/tools/h5diff/testfiles/h5diff_625.txt @@ -1,2 +1,3 @@ dataset: and 2 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_626.txt b/tools/h5diff/testfiles/h5diff_626.txt index be392ae..6494066 100644 --- a/tools/h5diff/testfiles/h5diff_626.txt +++ b/tools/h5diff/testfiles/h5diff_626.txt @@ -1,2 +1,3 @@ dataset: and 3 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_627.txt b/tools/h5diff/testfiles/h5diff_627.txt index 554f2ed..db14532 100644 --- a/tools/h5diff/testfiles/h5diff_627.txt +++ b/tools/h5diff/testfiles/h5diff_627.txt @@ -1,2 +1,3 @@ dataset: and 6 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_628.txt b/tools/h5diff/testfiles/h5diff_628.txt index 74decda..e11d8ee 100644 --- a/tools/h5diff/testfiles/h5diff_628.txt +++ b/tools/h5diff/testfiles/h5diff_628.txt @@ -1,2 +1,3 @@ dataset: and 1 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_629.txt b/tools/h5diff/testfiles/h5diff_629.txt index 4e67f57..7b9b2d8 100644 --- a/tools/h5diff/testfiles/h5diff_629.txt +++ b/tools/h5diff/testfiles/h5diff_629.txt @@ -1 +1,2 @@ h5diff: : unable to open file +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt index 30dbefe..7abcddd 100644 --- a/tools/h5diff/testfiles/h5diff_70.txt +++ b/tools/h5diff/testfiles/h5diff_70.txt @@ -2029,3 +2029,4 @@ position float3D of float3D of difference Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt index 33090df..1c55b1a 100644 --- a/tools/h5diff/testfiles/h5diff_80.txt +++ b/tools/h5diff/testfiles/h5diff_80.txt @@ -878,3 +878,4 @@ point #4 (2,8) (1,7) Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt index e6bfa14..fb23843 100644 --- a/tools/h5diff/testfiles/h5diff_90.txt +++ b/tools/h5diff/testfiles/h5diff_90.txt @@ -53,3 +53,4 @@ Not comparable: or is an empty dataset Some objects are not comparable -------------------------------- Use -c for a list of objects. +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_danglelinks1.h5 b/tools/h5diff/testfiles/h5diff_danglelinks1.h5 new file mode 100644 index 0000000..8cbaac1 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_danglelinks1.h5 differ diff --git a/tools/h5diff/testfiles/h5diff_danglelinks2.h5 b/tools/h5diff/testfiles/h5diff_danglelinks2.h5 new file mode 100644 index 0000000..f634210 Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_danglelinks2.h5 differ diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh index 9986585..d34931d 100755 --- a/tools/h5diff/testh5diff.sh +++ b/tools/h5diff/testh5diff.sh @@ -23,6 +23,11 @@ # Pedro Vicente Nunes: # 10/25/2005: Added test #9 # 11/27/2006: Added test #10, #11 +# Jonathan Kim: +# Improved to use single line +# Improved to check exit code (only serial mode, not necessary for parallel) +# Added test 400 - 425 (links with --follow-links option) +# Added test 450 - 459 (dangling links) ############################################################################### @@ -47,6 +52,8 @@ FILE15=h5diff_extlink_src.h5 FILE16=h5diff_extlink_trg.h5 FILE17=h5diff_ext2softlink_src.h5 FILE18=h5diff_ext2softlink_trg.h5 +DANGLE_LINK_FILE1=h5diff_danglelinks1.h5 +DANGLE_LINK_FILE2=h5diff_danglelinks2.h5 TESTNAME=h5diff EXIT_SUCCESS=0 @@ -192,9 +199,9 @@ TOOLTEST() { actual_err_sav=${actual_err}-sav shift if test -n "$pmode"; then - RUNCMD=$RUNPARALLEL + RUNCMD=$RUNPARALLEL else - RUNCMD=$RUNSERIAL + RUNCMD=$RUNSERIAL fi # Run test. @@ -206,32 +213,44 @@ TOOLTEST() { cd $srcdir/testfiles eval $RUNCMD $H5DIFF_BIN "$@" ) >$actual 2>$actual_err + EXIT_CODE=$? # save actual and actual_err in case they are needed later. cp $actual $actual_sav STDOUT_FILTER $actual cp $actual_err $actual_err_sav STDERR_FILTER $actual_err cat $actual_err >> $actual + # don't add exit code check in pmode, as it causes failure. (exit code + # is from mpirun not tool) + # if any problem occurs relate to an exit code, it will be caught in + # serial mode, so the test is fullfilled. + if test -z "$pmode"; then + echo "EXIT CODE: $EXIT_CODE" >> $actual + fi if [ ! -f $expect ]; then - # Create the expect file if it doesn't yet exist. + # Create the expect file if it doesn't yet exist. echo " CREATED" - cp $actual $expect + cp $actual $expect elif $CMP $expect $actual; then - echo " PASSED" + echo " PASSED" elif test -z "$pmode"; then - echo "*FAILED*" - echo " Expected result ($expect) differs from actual result ($actual)" - nerrors="`expr $nerrors + 1`" - test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /' + echo "*FAILED*" + echo " Expected result ($expect) differs from actual result ($actual)" + nerrors="`expr $nerrors + 1`" + test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/ /' else - # parallel mode output are often of different ordering from serial - # output. If the sorted expected and actual files compare the same, - # it is safe to assume the actual output match the expected file. - expect_sorted=expect_sorted - actual_sorted=actual_sorted - sort $expect -o $expect_sorted - sort $actual -o $actual_sorted + # parallel mode output are often of different ordering from serial + # output. If the sorted expected and actual files compare the same, + # it is safe to assume the actual output match the expected file. + expect_sorted=expect_sorted + actual_sorted=actual_sorted + sort $expect -o $expect_sorted + sort $actual -o $actual_sorted + # remove "EXIT CODE:" line from expect file. test for exit code + # is done by serial mode. + grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit + mv $expect_sorted.noexit $expect_sorted if $CMP $expect_sorted $actual_sorted; then echo " PASSED" else @@ -265,6 +284,7 @@ SKIP() { } + ############################################################################## # The tests # To avoid the printing of the complete full path of the test file, that hides @@ -536,134 +556,130 @@ TOOLTEST h5diff_206.txt -c $FILE2 $FILE2 g2/dset7 g2/dset8 TOOLTEST h5diff_207.txt -c $FILE2 $FILE2 g2/dset8 g2/dset9 # ############################################################################## -# # Links compare without -l (link follow) +# # Links compare without --follow-links nor --no-dangling-links # ############################################################################## # test for bug1749 TOOLTEST h5diff_300.txt -v $FILE12 $FILE12 /link_g1 /link_g2 # ############################################################################## -# # Links compare with -l (link follow) +# # Links compare with --follow-links Only # ############################################################################## # soft links file to file -TOOLTEST h5diff_400.txt -l -v $FILE13 $FILE13 +TOOLTEST h5diff_400.txt --follow-links -v $FILE13 $FILE13 # softlink vs dset" -TOOLTEST h5diff_401.txt -l -v $FILE13 $FILE13 /softlink_dset1_1 /target_dset2 - +TOOLTEST h5diff_401.txt --follow-links -v $FILE13 $FILE13 /softlink_dset1_1 /target_dset2 # dset vs softlink" -TOOLTEST h5diff_402.txt -l -v $FILE13 $FILE13 /target_dset2 /softlink_dset1_1 - +TOOLTEST h5diff_402.txt --follow-links -v $FILE13 $FILE13 /target_dset2 /softlink_dset1_1 # softlink vs softlink" -TOOLTEST h5diff_403.txt -l -v $FILE13 $FILE13 /softlink_dset1_1 /softlink_dset2 - +TOOLTEST h5diff_403.txt --follow-links -v $FILE13 $FILE13 /softlink_dset1_1 /softlink_dset2 # extlink vs extlink (FILE)" -if test -n "$pmode"; then - # TODO: Skip below test due to hang in prarllel mode - echo "Skip below test due to hang in prarllel mode" - SKIP -l -v $FILE15 $FILE15 -else - TOOLTEST h5diff_404.txt -l -v $FILE15 $FILE15 -fi - +TOOLTEST h5diff_404.txt --follow-links -v $FILE15 $FILE15 # extlink vs dset" -TOOLTEST h5diff_405.txt -l -v $FILE15 $FILE16 /ext_link_dset1 /target_group2/x_dset - +TOOLTEST h5diff_405.txt --follow-links -v $FILE15 $FILE16 /ext_link_dset1 /target_group2/x_dset # dset vs extlink" -TOOLTEST h5diff_406.txt -l -v $FILE16 $FILE15 /target_group2/x_dset /ext_link_dset1 - +TOOLTEST h5diff_406.txt --follow-links -v $FILE16 $FILE15 /target_group2/x_dset /ext_link_dset1 # extlink vs extlink" -TOOLTEST h5diff_407.txt -l -v $FILE15 $FILE15 /ext_link_dset1 /ext_link_dset2 - +TOOLTEST h5diff_407.txt --follow-links -v $FILE15 $FILE15 /ext_link_dset1 /ext_link_dset2 # softlink vs extlink" -TOOLTEST h5diff_408.txt -l -v $FILE13 $FILE15 /softlink_dset1_1 /ext_link_dset2 - +TOOLTEST h5diff_408.txt --follow-links -v $FILE13 $FILE15 /softlink_dset1_1 /ext_link_dset2 # extlink vs softlink " -TOOLTEST h5diff_409.txt -l -v $FILE15 $FILE13 /ext_link_dset2 /softlink_dset1_1 - +TOOLTEST h5diff_409.txt --follow-links -v $FILE15 $FILE13 /ext_link_dset2 /softlink_dset1_1 # linked_softlink vs linked_softlink (FILE)" -TOOLTEST h5diff_410.txt -l -v $FILE14 $FILE14 - +TOOLTEST h5diff_410.txt --follow-links -v $FILE14 $FILE14 # dset2 vs linked_softlink_dset1" -TOOLTEST h5diff_411.txt -l -v $FILE14 $FILE14 /target_dset2 /softlink1_to_slink2 - +TOOLTEST h5diff_411.txt --follow-links -v $FILE14 $FILE14 /target_dset2 /softlink1_to_slink2 # linked_softlink_dset1 vs dset2" -TOOLTEST h5diff_412.txt -l -v $FILE14 $FILE14 /softlink1_to_slink2 /target_dset2 - +TOOLTEST h5diff_412.txt --follow-links -v $FILE14 $FILE14 /softlink1_to_slink2 /target_dset2 # linked_softlink_to_dset1 vs linked_softlink_to_dset2" -TOOLTEST h5diff_413.txt -l -v $FILE14 $FILE14 /softlink1_to_slink2 /softlink2_to_slink2 - +TOOLTEST h5diff_413.txt --follow-links -v $FILE14 $FILE14 /softlink1_to_slink2 /softlink2_to_slink2 # group vs linked_softlink_group1" -TOOLTEST h5diff_414.txt -l -v $FILE14 $FILE14 /target_group /softlink3_to_slink2 - +TOOLTEST h5diff_414.txt --follow-links -v $FILE14 $FILE14 /target_group /softlink3_to_slink2 # linked_softlink_group1 vs group" -TOOLTEST h5diff_415.txt -l -v $FILE14 $FILE14 /softlink3_to_slink2 /target_group - +TOOLTEST h5diff_415.txt --follow-links -v $FILE14 $FILE14 /softlink3_to_slink2 /target_group # linked_softlink_to_group1 vs linked_softlink_to_group2" -TOOLTEST h5diff_416.txt -l -v $FILE14 $FILE14 /softlink3_to_slink2 /softlink4_to_slink2 - +TOOLTEST h5diff_416.txt --follow-links -v $FILE14 $FILE14 /softlink3_to_slink2 /softlink4_to_slink2 # non-exist-softlink vs softlink" -TOOLTEST h5diff_417.txt -l -v $FILE13 $FILE13 /softlink_noexist /softlink_dset2 - +TOOLTEST h5diff_417.txt --follow-links -v $FILE13 $FILE13 /softlink_noexist /softlink_dset2 # softlink vs non-exist-softlink" -TOOLTEST h5diff_418.txt -l -v $FILE13 $FILE13 /softlink_dset2 /softlink_noexist - +TOOLTEST h5diff_418.txt --follow-links -v $FILE13 $FILE13 /softlink_dset2 /softlink_noexist # non-exist-extlink_file vs extlink" -if test -n "$pmode"; then - # TODO: Skip below test due to hang in prarllel mode - echo "Skip below test due to hang in prarllel mode" - SKIP -l -v $FILE15 $FILE15 /ext_link_noexist2 /ext_link_dset2 -else - TOOLTEST h5diff_419.txt -l -v $FILE15 $FILE15 /ext_link_noexist2 /ext_link_dset2 -fi - +TOOLTEST h5diff_419.txt --follow-links -v $FILE15 $FILE15 /ext_link_noexist2 /ext_link_dset2 # exlink vs non-exist-extlink_file" -if test -n "$pmode"; then - # TODO: Skip below test due to hang in prarllel mode - echo "Skip below test due to hang in prarllel mode" - SKIP -l -v $FILE15 $FILE15 /ext_link_dset2 /ext_link_noexist2 -else - TOOLTEST h5diff_420.txt -l -v $FILE15 $FILE15 /ext_link_dset2 /ext_link_noexist2 -fi - +TOOLTEST h5diff_420.txt --follow-links -v $FILE15 $FILE15 /ext_link_dset2 /ext_link_noexist2 # extlink vs non-exist-extlink_obj" -TOOLTEST h5diff_421.txt -l -v $FILE15 $FILE15 /ext_link_dset2 /ext_link_noexist1 - +TOOLTEST h5diff_421.txt --follow-links -v $FILE15 $FILE15 /ext_link_dset2 /ext_link_noexist1 # non-exist-extlink_obj vs extlink" -TOOLTEST h5diff_422.txt -l -v $FILE15 $FILE15 /ext_link_noexist1 /ext_link_dset2 - +TOOLTEST h5diff_422.txt --follow-links -v $FILE15 $FILE15 /ext_link_noexist1 /ext_link_dset2 # extlink_to_softlink_to_dset1 vs dset2" -TOOLTEST h5diff_423.txt -l -v $FILE17 $FILE18 /ext_link_to_slink1 /dset2 - +TOOLTEST h5diff_423.txt --follow-links -v $FILE17 $FILE18 /ext_link_to_slink1 /dset2 # dset2 vs extlink_to_softlink_to_dset1" -TOOLTEST h5diff_424.txt -l -v $FILE18 $FILE17 /dset2 /ext_link_to_slink1 - +TOOLTEST h5diff_424.txt --follow-links -v $FILE18 $FILE17 /dset2 /ext_link_to_slink1 # extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2" -TOOLTEST h5diff_425.txt -l -v $FILE17 $FILE17 /ext_link_to_slink1 /ext_link_to_slink2 +TOOLTEST h5diff_425.txt --follow-links -v $FILE17 $FILE17 /ext_link_to_slink1 /ext_link_to_slink2 + + +# ############################################################################## +# # Dangling links compare (--follow-links and --no-dangling-links) +# ############################################################################## +# dangling links --follow-links (FILE to FILE) +TOOLTEST h5diff_450.txt --follow-links -v $DANGLE_LINK_FILE1 $DANGLE_LINK_FILE2 + +# dangling links --follow-links and --no-dangling-links (FILE to FILE) +TOOLTEST h5diff_451.txt --follow-links -v --no-dangling-links $DANGLE_LINK_FILE1 $DANGLE_LINK_FILE2 + +# try --no-dangling-links without --follow-links options +if test -n "$pmode"; then + # Skip this. Investigate later why act differently in pmode. + SKIP --no-dangling-links $FILE13 $FILE13 +else + TOOLTEST h5diff_452.txt --no-dangling-links $FILE13 $FILE13 +fi + +# dangling link found for soft links (FILE to FILE) +TOOLTEST h5diff_453.txt --follow-links -v --no-dangling-links $FILE13 $FILE13 + +# dangling link found for soft links (obj to obj) +TOOLTEST h5diff_454.txt --follow-links -v --no-dangling-links $FILE13 $FILE13 /softlink_dset2 /softlink_noexist + +# dangling link found for soft links (obj to obj) Both dangle links +TOOLTEST h5diff_455.txt --follow-links -v --no-dangling-links $FILE13 $FILE13 /softlink_noexist /softlink_noexist + +# dangling link found for ext links (FILE to FILE) +TOOLTEST h5diff_456.txt --follow-links -v --no-dangling-links $FILE15 $FILE15 + +# dangling link found for ext links (obj to obj). target file exist +TOOLTEST h5diff_457.txt --follow-links -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 +TOOLTEST h5diff_458.txt --follow-links -v --no-dangling-links $FILE15 $FILE15 /ext_link_dset1 /ext_link_noexist2 +# dangling link found for ext links (obj to obj). Both dangle links +TOOLTEST h5diff_459.txt --follow-links -v --no-dangling-links $FILE15 $FILE15 /ext_link_noexist1 /ext_link_noexist2 # ############################################################################## diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 26e769c..4129e33 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -27,24 +27,21 @@ typedef enum toolname_t { /* this struct can be used to differntiate among tools if necessary */ typedef struct { h5tool_toolname_t toolname; - int mode; + int msg_mode; } h5tool_opt_t; -/* To return link's target info +/* To return link info * Functions: - * H5tools_get_softlink_target_info() - * H5tools_get_extlink_target_info() + * H5tools_get_link_info() * Note: this may be move to h5tools code if used by other tools */ typedef struct { - const char *buf; /* IN: must be allocated along with H5Lget_info[li.u.val_size] */ - H5O_type_t type; /* OUT: target type */ - const char *path; /* OUT: target name */ - int is_path_malloced; /* VAR: Set to TRUE if path is malloced, so can be freed by checking this later. Needed when ext-link's target is soft-link */ - const char *extfile; /* OUT: if external link, external filename */ - hid_t extfile_id; /* OUT: if external link, external file id */ - h5tool_opt_t opt; /* IN: options */ -} h5tool_link_trg_info_t; + H5O_type_t trg_type; /* OUT: target type */ + const char *trg_path; /* OUT: target obj path. This must be freed + * when used with H5tools_get_link_info() */ + H5L_info_t linfo; /* OUT: link info */ + h5tool_opt_t opt; /* IN: options */ +} h5tool_link_info_t; /* * Debug printf macros. The prefix allows output filtering by test scripts. */ @@ -90,6 +87,21 @@ do_print_objname (const char *OBJ, const char *path1, const char *path2) parallel_print("%-7s: <%s> and <%s>\n", OBJ, path1, path2); } +/*------------------------------------------------------------------------- + * Function: print_warn + * + * Purpose: check print warning condition. + * Return: + * 1 if verbose mode + * 0 if not verbos mode + * Programmer: Jonathan Kim + * Date: Feb 4, 2010 + *------------------------------------------------------------------------- + */ +static int print_warn(diff_opt_t *options) +{ + return ((options->m_verbose))?1:0; +} #ifdef H5_HAVE_PARALLEL @@ -108,9 +120,9 @@ do_print_objname (const char *OBJ, const char *path1, const char *path2) */ void phdiff_dismiss_workers(void) { - int i; - for(i=1; i0) && g_Parallel) - { - printf("%s", outBuff); - - if(overflow_file) - { - int tmp; - - rewind(overflow_file); - while((tmp = getc(overflow_file)) >= 0) - putchar(tmp); - - fclose(overflow_file); - overflow_file = NULL; - } - - fflush(stdout); - memset(outBuff, 0, OUTBUFF_SIZE); - outBuffOffset = 0; - } - else if( (outBuffOffset>0) && !g_Parallel) - { - fprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n"); - } + /* If there was something we buffered, let's print it now */ + if( (outBuffOffset>0) && g_Parallel) + { + printf("%s", outBuff); + + if(overflow_file) + { + int tmp; + rewind(overflow_file); + while((tmp = getc(overflow_file)) >= 0) + putchar(tmp); + fclose(overflow_file); + overflow_file = NULL; + } + + fflush(stdout); + memset(outBuff, 0, OUTBUFF_SIZE); + outBuffOffset = 0; + } + else if( (outBuffOffset>0) && !g_Parallel) + { + fprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n"); + } } /*------------------------------------------------------------------------- @@ -174,253 +184,147 @@ void print_manager_output(void) static void print_incoming_data(void) { - char data[PRINT_DATA_MAX_SIZE+1]; - int incomingMessage; - MPI_Status Status; - - do - { - MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status); - if(incomingMessage) - { - memset(data, 0, PRINT_DATA_MAX_SIZE+1); - MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); - - printf("%s", data); - } - } while(incomingMessage); + char data[PRINT_DATA_MAX_SIZE+1]; + int incomingMessage; + MPI_Status Status; + + do + { + MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status); + if(incomingMessage) + { + memset(data, 0, PRINT_DATA_MAX_SIZE+1); + MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); + + printf("%s", data); + } + } while(incomingMessage); } #endif /*------------------------------------------------------------------------- - * Function: H5tools_get_softlink_target_info + * Function: H5tools_get_link_info * - * Purpose: Get target object's type and path from soft-link path + * Purpose: Get link (soft, external) info and its target object type + (dataset, group, named datatype) and path, if exist * * Patameters: - * - [IN] fileid : soft-link file id - * - [IN] linkpath : soft-link's source path - * - [IN] h5li : soft-link's source H5L_info_t - * - [OUT] trg_info: returning target info (refer to struct) + * - [IN] fileid : link file id + * - [IN] linkpath : link path + * - [OUT] h5li : link's info (H5L_info_t) + * - [OUT] link_info: returning target object info (h5tool_link_info_t) * - * Return: - * Success - 1 and return data via trg_info struct - * Fail - 0 + * Return: + * 1 : Succed to get link info. + * 0 : Detected as a dangling link + * -1 : H5 API failed. * - * Note: - * trg_info->buf must be allocated along with H5Lget_info[li.u.val_size] - * before passing to this function. + * NOTE: + * link_info->trg_path must be freed out of this function * * Programmer: Jonathan Kim * - * Date: Jan 20, 2010 + * Date: Feb 8, 2010 *-------------------------------------------------------------------------*/ -static int H5tools_get_softlink_target_info(hid_t file_id, const char * linkpath, H5L_info_t h5li, h5tool_link_trg_info_t *s_trg_info) +static int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info) { - H5O_type_t otype = H5O_TYPE_UNKNOWN; - H5O_info_t oinfo; - H5L_info_t linfo; - int ret = 0; /* init to fail */ + int Ret = -1; /* init to fail */ + htri_t l_ret; + H5O_info_t trg_oinfo; + hid_t fapl; + hid_t lapl = H5P_DEFAULT; + /* init */ + link_info->trg_type = H5O_TYPE_UNKNOWN; - if((H5Lexists(file_id, linkpath, H5P_DEFAULT) <= 0)) + if(H5Lget_info(file_id, linkpath, &(link_info->linfo), H5P_DEFAULT) < 0) { - parallel_print("error: \"%s\" doesn't exist \n",linkpath); + if(link_info->opt.msg_mode==1) + parallel_print("Warning: unable to get link info from <%s>\n",linkpath); goto out; } - if(H5Lget_info(file_id, linkpath, &linfo, H5P_DEFAULT) < 0) + /* check if link name exist */ + if((H5Lexists(file_id, linkpath, H5P_DEFAULT) <= 0)) { - parallel_print("error: unable to get link info from \"%s\"\n",linkpath); + if(link_info->opt.msg_mode==1) + parallel_print("Warning: link <%s> doesn't exist \n",linkpath); goto out; } - /* get target name for softlink */ - if(linfo.type == H5L_TYPE_SOFT) - { - /* s_trg_info->buf should be already allocated out of - * this function and free when done */ - if(H5Lget_val(file_id, linkpath, s_trg_info->buf, h5li.u.val_size, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get link value from \"%s\"\n",s_trg_info->path); - goto out; - } - /* target path */ - s_trg_info->path = s_trg_info->buf; - } - /* if obj is hard link, will still get the type */ - else if (linfo.type == H5L_TYPE_HARD) - { - s_trg_info->path = linkpath; - } - - /*-------------------------------------------------------------- - * if link target or object exit, get type - */ - if((H5Lexists(file_id, s_trg_info->path, H5P_DEFAULT) == TRUE)) - { - - if(H5Oget_info_by_name(file_id, s_trg_info->path, &oinfo, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get object information for \"%s\"\n", s_trg_info->path); - goto out; - } - - otype = oinfo.type; - - - /* check unknown type */ - if (otype < H5O_TYPE_GROUP || otype >=H5O_TYPE_NTYPES) - { - parallel_print("<%s> is unknown type\n", s_trg_info->path); - goto out; - } - } - else - { - parallel_print("warn: link target \"%s\" doesn't exist \n", s_trg_info->path); - } - - /* set target obj type to return */ - s_trg_info->type = otype; - - /* succeed */ - ret = 1; -out: - return ret; -} - -/*------------------------------------------------------------------------- - * Function: H5tools_get_extlink_target_info - * - * Purpose: Get target object's type, path, file_id and filename from - * external-link - * - * Patameters: - * - [IN] fileid : external-link source file-id - * - [IN] linkpath : external-link source path - * - [IN] h5li : external-link source H5L_info_t - * - [OUT] trg_info : returning target info (refer to struct) - * - * Return: - * Success - 1 and return data via trg_info struct - * Fail - 0 - * - * Note: - * - trg_info->buf must be allocated along with H5Lget_info[li.u.val_size] - * before passing to this function. - * - if target is soft-link, trg_info->path will be malloced. so check if - * trg_info->is_path_malloced==TRUE, then free trg_info->path along with freeing - * trg_info->buf outside of this function. - * - * Programmer: Jonathan Kim - * - * Date: Jan 20, 2010 - *-------------------------------------------------------------------------*/ -static int H5tools_get_extlink_target_info(hid_t fileid, const char *linkpath, H5L_info_t h5li, h5tool_link_trg_info_t *trg_info) -{ - - hid_t extfile_id; - const char *extlink_file; - const char *extlink_path; - h5tool_link_trg_info_t soft_trg_info; - H5L_info_t slinfo; - int ret=0; /* init to Fail */ + /* trg_path must be freed out of this function when finished using */ + link_info->trg_path = (char*)HDcalloc(link_info->linfo.u.val_size, sizeof(char)); + HDassert(link_info->trg_path); - /* init */ - HDmemset(&soft_trg_info, 0, sizeof(h5tool_link_trg_info_t)); - trg_info->type = H5O_TYPE_UNKNOWN; - - if(H5Lget_val(fileid, linkpath, trg_info->buf, h5li.u.val_size, H5P_DEFAULT) < 0) + /* get link value */ + if(H5Lget_val(file_id, linkpath, link_info->trg_path, link_info->linfo.u.val_size, H5P_DEFAULT) < 0) { - parallel_print("error: unable to get link value from \"%s\"\n",linkpath); + if(link_info->opt.msg_mode==1) + parallel_print("Warning: unable to get link value from <%s>\n",linkpath); goto out; } - /*--------------------------------------- - * get target filename and object path + + /*----------------------------------------------------- + * if link type is external link use different lapl to + * follow object in other file */ - if(H5Lunpack_elink_val(trg_info->buf, h5li.u.val_size, NULL, &extlink_file, &extlink_path)<0) + if (link_info->linfo.type == H5L_TYPE_EXTERNAL) { - parallel_print("error: unable to unpack external link value\n"); - goto out; + fapl = H5Pcreate(H5P_FILE_ACCESS); + H5Pset_fapl_sec2(fapl); + lapl = H5Pcreate(H5P_LINK_ACCESS); + H5Pset_elink_fapl(lapl, fapl); } - /* return target filename and obj path */ - trg_info->path = extlink_path; - trg_info->extfile = extlink_file; - - /* --------------------------------- - * get file id from external file - * mimicked from h5diff() for Parallel code - * , but not sure if it's needed + /*-------------------------------------------------------------- + * if link's target object exist, get type */ - H5E_BEGIN_TRY + /* check if target object exist */ + l_ret = H5Oexists_by_name(file_id, linkpath, lapl); + + /* detect dangling link */ + if(l_ret == FALSE) { - /* open file */ - if((extfile_id = h5tools_fopen(extlink_file, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) - { - parallel_print("error: <%s>: unable to open file\n", extlink_file); -#ifdef H5_HAVE_PARALLEL - if(g_Parallel) - /* Let tasks know that they won't be needed */ - phdiff_dismiss_workers(); -#endif + Ret = 0; goto out; - } /* end if */ - } H5E_END_TRY; - - /* get external file id */ - trg_info->extfile_id = extfile_id; - - /* -------------------------------------------------- - * check if target is soft link, if so allocate buffer - */ - if((H5Lexists(trg_info->extfile_id, trg_info->path, H5P_DEFAULT) <= 0)) - { - parallel_print("error: \"%s\" doesn't exist \n", trg_info->path); - goto out; } - if(H5Lget_info(trg_info->extfile_id, trg_info->path, &slinfo, H5P_DEFAULT) < 0) + /* function failed */ + else if (l_ret < 0) { - parallel_print("error: unable to get link info from \"%s\"\n", trg_info->path); - goto out; + goto out; } - /* if ext-link's target is soft-link */ - if(slinfo.type == H5L_TYPE_SOFT) + /* get target object info */ + if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) { - size_t bufsize = (h5li.u.val_size > slinfo.u.val_size)?h5li.u.val_size:slinfo.u.val_size; - soft_trg_info.buf = (char*)HDcalloc(bufsize, sizeof(char)); - HDassert(trg_info->path); + if(link_info->opt.msg_mode==1) + parallel_print("Warning: unable to get object information for <%s>\n", linkpath); + goto out; } - /* get target obj type */ - if(H5tools_get_softlink_target_info(trg_info->extfile_id, trg_info->path, h5li, &soft_trg_info)==0) + /* check unknown type */ + if (trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES) { - parallel_print("error: unable to get link info from \"%s\"\n", trg_info->path); + if(link_info->opt.msg_mode==1) + parallel_print("Warning: target object of <%s> is unknown type\n", linkpath); goto out; - } + } - /* target obj type */ - trg_info->type = soft_trg_info.type; + /* set target obj type to return */ + link_info->trg_type = trg_oinfo.type; - /* if ext-link's target is soft-link */ - if(slinfo.type == H5L_TYPE_SOFT) + /* succeed */ + Ret = 1; +out: + if (link_info->linfo.type == H5L_TYPE_EXTERNAL) { - trg_info->path = HDstrdup(soft_trg_info.buf); - HDassert(trg_info->path); - /* set TRUE so this can be freed later */ - trg_info->is_path_malloced = TRUE; + H5Pclose(fapl); + H5Pclose(lapl); } - /* Success */ - ret=1; -out: - if(soft_trg_info.buf) - HDfree(soft_trg_info.buf); - - return ret; + return Ret; } + /*------------------------------------------------------------------------- * Function: h5diff * @@ -451,13 +355,6 @@ hsize_t h5diff(const char *fname1, HDmemset(filenames, 0, 1024 * 2); - if(options->m_quiet && (options->m_verbose || options->m_report)) - { - parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n"); - options->err_stat=1; - return 0; - } /* end if */ - /*------------------------------------------------------------------------- * open the files first; if they are not valid, no point in continuing *------------------------------------------------------------------------- @@ -468,7 +365,7 @@ hsize_t h5diff(const char *fname1, { /* 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); @@ -484,8 +381,8 @@ hsize_t h5diff(const char *fname1, /* 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); @@ -546,12 +443,10 @@ hsize_t h5diff(const char *fname1, info2, options); } /* end if */ - /*------------------------------------------------------------------------- * compare all *------------------------------------------------------------------------- */ - else { #ifdef H5_HAVE_PARALLEL @@ -715,14 +610,14 @@ hsize_t diff_match(hid_t file1_id, * 2) the graph must match, i.e same names (absolute path) * 3) objects with the same name must be of the same type *------------------------------------------------------------------------- - */ - + */ + /* number of different objects */ if ( info1->nused != info2->nused ) { options->contents = 0; } - + /* objects in one file and not the other */ for( i = 0; i < table->nobjs; i++) { @@ -733,7 +628,7 @@ hsize_t diff_match(hid_t file1_id, } /* objects with the same name but different HDF5 types */ - for( i = 0; i < table->nobjs; i++) + for( i = 0; i < table->nobjs; i++) { if ( table->objs[i].flags[0] && table->objs[i].flags[1] ) { @@ -751,8 +646,8 @@ hsize_t diff_match(hid_t file1_id, *------------------------------------------------------------------------- */ #ifdef H5_HAVE_PARALLEL -{ - char *workerTasks = HDmalloc((g_nTasks - 1) * sizeof(char)); + { + char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char)); int n; int busyTasks = 0; struct diffs_found nFoundbyWorker; @@ -1043,7 +938,7 @@ hsize_t diff_match(hid_t file1_id, h5diffdebug("done with if block\n"); free(workerTasks); -} + } #endif /* H5_HAVE_PARALLEL */ /* free table */ @@ -1061,9 +956,10 @@ hsize_t diff_match(hid_t file1_id, * Return: Number of differences found * * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu - * * Date: May 9, 2003 * + * Programmer: Jonathan Kim + * - add following links feature (Feb 11,2010) *------------------------------------------------------------------------- */ @@ -1081,30 +977,20 @@ hsize_t diff_compare(hid_t file1_id, int f2 = 0; hsize_t nfound = 0; ssize_t i,j; + int l_ret; + int is_dangle_link1 = 0; + int is_dangle_link2 = 0; /* local variables for diff() */ - hid_t l_fileid1=file1_id; - hid_t l_fileid2=file2_id; h5trav_type_t obj1type, obj2type; - const char *obj1name, *obj2name; - - /* softlink info to get target name and type */ - h5tool_link_trg_info_t softlinkinfo1; - h5tool_link_trg_info_t softlinkinfo2; - /* external link file id */ - hid_t extfile1_id = (-1); - hid_t extfile2_id = (-1); - h5tool_link_trg_info_t extlinkinfo1; - h5tool_link_trg_info_t extlinkinfo2; + /* to get link info */ + h5tool_link_info_t linkinfo1; + h5tool_link_info_t linkinfo2; - /* init softlink info */ - HDmemset(&softlinkinfo1, 0, sizeof(h5tool_link_trg_info_t)); - HDmemset(&softlinkinfo2, 0, sizeof(h5tool_link_trg_info_t)); - - /* init external link info */ - HDmemset(&extlinkinfo1, 0, sizeof(h5tool_link_trg_info_t)); - HDmemset(&extlinkinfo2, 0, sizeof(h5tool_link_trg_info_t)); + /* init link info struct */ + HDmemset(&linkinfo1, 0, sizeof(h5tool_link_info_t)); + HDmemset(&linkinfo2, 0, sizeof(h5tool_link_info_t)); i = h5trav_getindex (info1, obj1_name); j = h5trav_getindex (info2, obj2_name); @@ -1128,206 +1014,220 @@ hsize_t diff_compare(hid_t file1_id, } /* use the name with "/" first, as obtained by iterator function */ - obj1name = info1->paths[i].path; - obj2name = info2->paths[j].path; + obj1_name = info1->paths[i].path; + obj2_name = info2->paths[j].path; obj1type = info1->paths[i].type; obj2type = info2->paths[j].type; /*----------------------------------------------------------------- - * follow link option, compare with target object + * follow link option, compare with target object */ - if (options->linkfollow) + if (options->follow_links) { - H5L_info_t li1, li2; + /* pass how to handle printing warning to linkinfo option */ + if(print_warn(options)) + linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1; /*------------------------------------------------------------ * Soft links *------------------------------------------------------------*/ - /*------------------------ - * if object1 softlink - */ + /*-------------------------- + * if object1 soft link */ if (obj1type == H5TRAV_TYPE_LINK) { - if(H5Lget_info(file1_id, obj1_name, &li1, H5P_DEFAULT) < 0) + /* get type of target object */ + l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1); + /* dangling link */ + if (l_ret == 0) { - parallel_print("error: unable to get link info from \"%s\"\n",obj1_name); - goto out; + if (options->no_dangle_links) + { + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", obj1_name); + options->err_stat = 1; + goto out; + } + else + is_dangle_link1 = 1; } - - softlinkinfo1.buf = (char*)HDcalloc(li1.u.val_size, sizeof(char)); - HDassert(softlinkinfo1.buf); - - /* get type and name of target object */ - if(H5tools_get_softlink_target_info(file1_id, obj1_name, li1, &softlinkinfo1)==0) + /* fail */ + else if(l_ret < 0) { - parallel_print("error: unable to get softlink info from \"%s\"\n",obj1_name); + options->err_stat = 1; goto out; } - - /* set target name and type to pass diff() */ - obj1type = softlinkinfo1.type; - obj1name = softlinkinfo1.path; + else /* OK */ + { + /* target type for diff() */ + obj1type = linkinfo1.trg_type; + } } - - /*------------------------ - * if object2 is softlink - */ + + /*----------------------------- + * if object2 is soft link */ if (obj2type == H5TRAV_TYPE_LINK) { - if(H5Lget_info(file2_id, obj2_name, &li2, H5P_DEFAULT) < 0) + /* get type target object */ + l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2); + /* dangling link */ + if (l_ret == 0) { - parallel_print("error: unable to get link info from \"%s\"\n",obj2_name); - goto out; + if (options->no_dangle_links) + { + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", obj2_name); + options->err_stat = 1; + goto out; + } + else + is_dangle_link2=1; } - - - softlinkinfo2.buf = (char*)HDcalloc(li2.u.val_size, sizeof(char)); - HDassert(softlinkinfo2.buf); - - /* get type and name of target object */ - if(H5tools_get_softlink_target_info(file2_id, obj2_name, li2, &softlinkinfo2)==0) + /* fail */ + else if(l_ret < 0) { - parallel_print("error: unable to get softlink info from \"%s\"\n",obj2_name); + options->err_stat = 1; goto out; } - - /* set target name and type to pass diff() */ - obj2type = softlinkinfo2.type; - obj2name = softlinkinfo2.path; + else /* OK */ + { + /* target type for diff() */ + obj2type = linkinfo2.trg_type; + } } /*------------------------------------------------------------ * External links *------------------------------------------------------------*/ - /*------------------------------- - * if object1 is external link - */ + /*-------------------------------- + * if object1 is external link */ if (obj1type == H5TRAV_TYPE_UDLINK) { - if(H5Lget_info(file1_id, obj1_name, &li1, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get link info from \"%s\"\n",obj1_name); - goto out; - } - - /* for external link */ - if(li1.type == H5L_TYPE_EXTERNAL) + /* get type and name of target object */ + l_ret = H5tools_get_link_info(file1_id, obj1_name, &linkinfo1); + /* dangling link */ + if (l_ret == 0) { - extlinkinfo1.buf = (char*)HDcalloc(li1.u.val_size, sizeof(char)); - HDassert(extlinkinfo1.buf); - - /* get type and name of target object */ - if(H5tools_get_extlink_target_info(file1_id, obj1_name, li1, &extlinkinfo1)==0) + if (options->no_dangle_links) { - parallel_print("error: unable to get external link info from \"%s\"\n",obj1_name); + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", obj1_name); + options->err_stat = 1; goto out; } - - /* if valid actual object */ - if (extlinkinfo1.type < H5O_TYPE_GROUP || extlinkinfo1.type >= H5O_TYPE_NTYPES) - { - if (options->m_verbose) - { - parallel_print("<%s> is invaild type\n", obj1_name); - } - goto out; - } - - /* set target fileid, name and type to pass diff() */ - l_fileid1 = extlinkinfo1.extfile_id; - obj1name = extlinkinfo1.path; - obj1type = extlinkinfo1.type; + else + is_dangle_link1 = 1; } - } - - /*------------------------------- - * if object2 is external link - */ - if (obj2type == H5TRAV_TYPE_UDLINK) - { - if(H5Lget_info(file2_id, obj2_name, &li2, H5P_DEFAULT) < 0) + /* fail */ + else if(l_ret < 0) { - parallel_print("error: unable to get link info from \"%s\"\n",obj2_name); + options->err_stat = 1; goto out; } - /* for external link */ - if(li2.type == H5L_TYPE_EXTERNAL) + else /* OK */ { - extlinkinfo2.buf = (char*)HDcalloc(li2.u.val_size, sizeof(char)); - HDassert(extlinkinfo2.buf); + /* for external link */ + if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL) + obj1type = linkinfo1.trg_type; + } + } - /* get type and name of target object */ - if(H5tools_get_extlink_target_info(file2_id, obj2_name, li2, &extlinkinfo2)==0) - { - parallel_print("error: unable to get external link info from \"%s\"\n",obj2_name); - goto out; - } - /* if valid actual object */ - if (extlinkinfo2.type < H5O_TYPE_GROUP || extlinkinfo2.type >= H5O_TYPE_NTYPES) + /*-------------------------------- + * if object2 is external link */ + if (obj2type == H5TRAV_TYPE_UDLINK) + { + /* get type and name of target object */ + l_ret = H5tools_get_link_info(file2_id, obj2_name, &linkinfo2); + /* dangling link */ + if (l_ret == 0) + { + if (options->no_dangle_links) { - if (options->m_verbose) - { - parallel_print("<%s> is invaild type\n", obj2_name); - } + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", obj2_name); + options->err_stat = 1; goto out; } - - /* set target fileid, name and type to pass diff() */ - l_fileid2 = extlinkinfo2.extfile_id; - obj2name = extlinkinfo2.path; - obj2type = extlinkinfo2.type; + else + is_dangle_link2 = 1; + } + /* fail */ + else if(l_ret < 0) + { + options->err_stat = 1; + goto out; + } + else /* OK */ + { + /* for external link */ + if(linkinfo2.linfo.type == H5L_TYPE_EXTERNAL) + obj2type = linkinfo2.trg_type; } } - } /* end of linkfollow */ - + /* found dangling link */ + if (is_dangle_link1 || is_dangle_link2) + goto out; + } /* end of follow_links */ + /* objects are not the same type */ if (obj1type != obj2type) { if (options->m_verbose||options->m_list_not_cmp) { parallel_print("<%s> is of type %s and <%s> is of type %s\n", - obj1name, get_type(obj1type), obj2name, - get_type(obj2type)); + obj1_name, get_type(obj1type), + obj2_name, get_type(obj2type)); } options->not_cmp=1; goto out; } - nfound = diff(l_fileid1, obj1name, - l_fileid2, obj2name, + nfound = diff(file1_id, obj1_name, + file2_id, obj2_name, options, obj1type); out: - /* free soft link buffer */ - if (softlinkinfo1.buf) - HDfree(softlinkinfo1.buf); - if (softlinkinfo2.buf) - HDfree(softlinkinfo2.buf); - /* free external link buffer */ - if (extlinkinfo1.buf); + /*------------------------------- + * handle dangling link(s) */ + /* both obj1 and obj2 are dangling links */ + if(is_dangle_link1 && is_dangle_link2) { - HDfree(extlinkinfo1.buf); - /* case for ext-link's target is soft-link */ - if(extlinkinfo1.is_path_malloced) - HDfree(extlinkinfo1.path); + if(print_objname(options, nfound)) + { + do_print_objname("dangling link", obj1_name, obj2_name); + print_found(nfound); + } } - if (extlinkinfo2.buf); + /* obj1 is dangling link */ + else if (is_dangle_link1) { - HDfree(extlinkinfo2.buf); - /* case for ext-link's target is soft-link */ - if(extlinkinfo2.is_path_malloced) - HDfree(extlinkinfo2.path); + if(options->m_verbose) + parallel_print("obj1 <%s> is a dangling link.\n", obj1_name); + nfound++; + if(print_objname(options, nfound)) + print_found(nfound); } - - /* close external file */ - H5E_BEGIN_TRY + /* obj2 is dangling link */ + else if (is_dangle_link2) { - H5Fclose(extfile1_id); - H5Fclose(extfile2_id); - } H5E_END_TRY; + if(options->m_verbose) + parallel_print("obj2 <%s> is a dangling link.\n", obj2_name); + nfound++; + if(print_objname(options, nfound)) + print_found(nfound); + } + + /* free link info buffer */ + if (linkinfo1.trg_path) + HDfree(linkinfo1.trg_path); + if (linkinfo2.trg_path) + HDfree(linkinfo2.trg_path); return nfound; } @@ -1346,9 +1246,10 @@ out: * Return: Number of differences found * * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu - * * Date: May 9, 2003 * + * Programmer: Jonathan Kim + * - add following links feature (Feb 11,2010) *------------------------------------------------------------------------- */ @@ -1364,24 +1265,28 @@ hsize_t diff(hid_t file1_id, hid_t grp1_id = (-1); hid_t grp2_id = (-1); int ret; + int is_dangle_link1 = 0; + int is_dangle_link2 = 0; hsize_t nfound = 0; - char *extlinkbuf1=NULL; - char *extlinkbuf2=NULL; - /* used in soft link case (H5TRAV_TYPE_LINK) */ - h5tool_link_trg_info_t softlinkinfo1; - h5tool_link_trg_info_t softlinkinfo2; - /*init */ - HDmemset(&softlinkinfo1,0,sizeof(h5tool_link_trg_info_t)); - HDmemset(&softlinkinfo2,0,sizeof(h5tool_link_trg_info_t)); + /* to get link info */ + h5tool_link_info_t linkinfo1; + h5tool_link_info_t linkinfo2; + + /*init link info struct */ + HDmemset(&linkinfo1,0,sizeof(h5tool_link_info_t)); + HDmemset(&linkinfo2,0,sizeof(h5tool_link_info_t)); + /* pass how to handle printing warnings to linkinfo option */ + if(print_warn(options)) + linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1; switch(type) { - /*------------------------------------------------------------------------- + /*---------------------------------------------------------------------- * H5TRAV_TYPE_DATASET - *------------------------------------------------------------------------- + *---------------------------------------------------------------------- */ case H5TRAV_TYPE_DATASET: /* verbose (-v) and report (-r) mode */ @@ -1404,14 +1309,14 @@ hsize_t diff(hid_t file1_id, if (!options->not_cmp && nfound) { do_print_objname("dataset", path1, path2); - print_found(nfound); + print_found(nfound); } } break; - /*------------------------------------------------------------------------- + /*---------------------------------------------------------------------- * H5TRAV_TYPE_NAMED_DATATYPE - *------------------------------------------------------------------------- + *---------------------------------------------------------------------- */ case H5TRAV_TYPE_NAMED_DATATYPE: if((type1_id = H5Topen2(file1_id, path1, H5P_DEFAULT)) < 0) @@ -1432,10 +1337,11 @@ hsize_t diff(hid_t file1_id, if(options->m_verbose) print_found(nfound); - /*------------------------------------------------------------------------- + /*----------------------------------------------------------------- * compare attributes - * the if condition refers to cases when the dataset is a referenced object - *------------------------------------------------------------------------- + * the if condition refers to cases when the dataset is a + * referenced object + *----------------------------------------------------------------- */ if(path1) nfound += diff_attr(type1_id, type2_id, path1, path2, options); @@ -1446,9 +1352,9 @@ hsize_t diff(hid_t file1_id, goto out; break; - /*------------------------------------------------------------------------- + /*---------------------------------------------------------------------- * H5TRAV_TYPE_GROUP - *------------------------------------------------------------------------- + *---------------------------------------------------------------------- */ case H5TRAV_TYPE_GROUP: ret = HDstrcmp(path1, path2); @@ -1468,10 +1374,11 @@ hsize_t diff(hid_t file1_id, if((grp2_id = H5Gopen2(file2_id, path2, H5P_DEFAULT)) < 0) goto out; - /*------------------------------------------------------------------------- + /*----------------------------------------------------------------- * compare attributes - * the if condition refers to cases when the dataset is a referenced object - *------------------------------------------------------------------------- + * the if condition refers to cases when the dataset is a + * referenced object + *----------------------------------------------------------------- */ if(path1) nfound += diff_attr(grp1_id, grp2_id, path1, path2, options); @@ -1483,42 +1390,54 @@ hsize_t diff(hid_t file1_id, break; - /*------------------------------------------------------------------------- + /*---------------------------------------------------------------------- * H5TRAV_TYPE_LINK - *------------------------------------------------------------------------- + *---------------------------------------------------------------------- */ case H5TRAV_TYPE_LINK: { - H5L_info_t li1, li2; - - if(H5Lget_info(file1_id, path1, &li1, H5P_DEFAULT) < 0) + /* get type and name of target object */ + ret = H5tools_get_link_info(file1_id, path1, &linkinfo1); + /* dangling link */ + if (ret == 0) { - parallel_print("error: unable to get link info from \"%s\"\n", path1); - goto out; + if (options->no_dangle_links) + { + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", path1); + goto out; + } + else + is_dangle_link1 = 1; } - if(H5Lget_info(file2_id, path2, &li2, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get link info from \"%s\"\n", path2); + else if (ret < 0) goto out; - } - - softlinkinfo1.buf = (char*)HDcalloc(li1.u.val_size, sizeof(char)); - HDassert(softlinkinfo1.buf); - softlinkinfo2.buf = (char*)HDcalloc(li2.u.val_size, sizeof(char)); - HDassert(softlinkinfo2.buf); - if(H5tools_get_softlink_target_info(file1_id,path1,li1,&softlinkinfo1)==0) + /* get type and name of target object */ + ret = H5tools_get_link_info(file2_id, path2, &linkinfo2); + /* dangling link */ + if (ret == 0) { - parallel_print("error: unable to get softlink info from \"%s\"\n", path1); - goto out; + if (options->no_dangle_links) + { + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", path2); + goto out; + } + else + is_dangle_link2 = 1; } - if(H5tools_get_softlink_target_info(file2_id,path2,li2,&softlinkinfo2)==0) - { - parallel_print("error: unable to get softlink info from \"%s\"\n", path2); + else if (ret < 0) goto out; - } + - ret = HDstrcmp(softlinkinfo1.path, softlinkinfo2.path); + /* found dangling link */ + if (is_dangle_link1 || is_dangle_link2) + goto out2; + + ret = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path); /* if the target link name is not same then the links are "different" */ nfound = (ret != 0) ? 1 : 0; @@ -1526,115 +1445,124 @@ hsize_t diff(hid_t file1_id, if(print_objname(options, nfound)) do_print_objname("link", path1, path2); - if (options->linkfollow) + if (options->follow_links) { /* objects are not the same type */ - if (softlinkinfo1.type != softlinkinfo2.type) + if (linkinfo1.trg_type != linkinfo2.trg_type) { if (options->m_verbose||options->m_list_not_cmp) { - parallel_print("<%s> is of type %d and <%s> is of type %d\n", softlinkinfo1.path, softlinkinfo1.type, softlinkinfo2.path, softlinkinfo2.type); + parallel_print("<%s> is of type %s and <%s> is of type %s\n", path1, get_type(linkinfo1.trg_type), path2, get_type(linkinfo2.trg_type)); } options->not_cmp=1; goto out; } - nfound += diff(file1_id, softlinkinfo1.path, - file2_id, softlinkinfo2.path, - options, softlinkinfo1.type); + /* call self to compare target object */ + nfound += diff(file1_id, path1, + file2_id, path2, + options, linkinfo1.trg_type); } /* always print the number of differences found in verbose mode */ if(options->m_verbose) print_found(nfound); - HDfree(softlinkinfo1.buf); - HDfree(softlinkinfo2.buf); + /* free link info buffer */ + HDfree(linkinfo1.trg_path); + HDfree(linkinfo2.trg_path); } break; - /*------------------------------------------------------------------------- + /*---------------------------------------------------------------------- * H5TRAV_TYPE_UDLINK - *------------------------------------------------------------------------- + *---------------------------------------------------------------------- */ case H5TRAV_TYPE_UDLINK: { - H5L_info_t li1, li2; - - if(H5Lget_info(file1_id, path1, &li1, H5P_DEFAULT) < 0) + /* get type and name of target object */ + ret = H5tools_get_link_info(file1_id, path1, &linkinfo1); + /* dangling link */ + if (ret == 0) { - parallel_print("error: unable to get udlink info from \"%s\"\n", path1); - goto out; + if (options->no_dangle_links) + { + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", path1); + goto out; + } + else + is_dangle_link1=1; } - if(H5Lget_info(file2_id, path2, &li2, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get udlink info from \"%s\"\n", path2); + else if (ret < 0) goto out; - } - /* Only external links will have a query function registered */ - if(li1.type == H5L_TYPE_EXTERNAL && li2.type == H5L_TYPE_EXTERNAL) + /* get type and name of target object */ + ret = H5tools_get_link_info(file2_id, path2, &linkinfo2); + /* dangling link */ + if (ret == 0) { - - extlinkbuf1 = (char*)HDcalloc(li1.u.val_size, sizeof(char)); - HDassert(extlinkbuf1); - extlinkbuf2 = (char*)HDcalloc(li2.u.val_size, sizeof(char)); - HDassert(extlinkbuf2); - - if(H5Lget_val(file1_id, path1, extlinkbuf1, li1.u.val_size, H5P_DEFAULT) < 0) - { - parallel_print("error: unable to get link value from \"%s\"\n",path1); - goto out; - } /* end if */ - if(H5Lget_val(file2_id, path2, extlinkbuf2, li2.u.val_size, H5P_DEFAULT) < 0) + if (options->no_dangle_links) { - parallel_print("error: unable to get link value from \"%s\"\n",path2); + /* gangling link is error */ + if(options->m_verbose) + parallel_print("Warning: <%s> is a dangling link.\n", path2); goto out; - } /* end if */ + } + else + is_dangle_link2=1; + } + else if (ret < 0) + goto out; + + /* found dangling link */ + if (is_dangle_link1 || is_dangle_link2) + goto out2; + /* Only external links will have a query function registered */ + if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL) + { /* If the buffers are the same size, compare them */ - if(li1.u.val_size == li2.u.val_size) + if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size) { - ret = HDmemcmp(extlinkbuf1, extlinkbuf2, li1.u.val_size); + ret = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size); } else ret = 1; - /* if "extlinkbuf1" != "extlinkbuf2" then the links are "different" */ + /* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links + * are "different" extlinkinfo#.path is combination string of + * file_name and obj_name + */ nfound = (ret != 0) ? 1 : 0; if(print_objname(options, nfound)) do_print_objname("external link", path1, path2); - if (options->linkfollow) + if (options->follow_links) { - const char *extlink_file1; - const char *extlink_path1; - const char *extlink_file2; - const char *extlink_path2; - - /* get file name and obj path */ - if(H5Lunpack_elink_val(extlinkbuf1, li1.u.val_size, NULL, &extlink_file1, &extlink_path1)<0) + /* objects are not the same type */ + if (linkinfo1.trg_type != linkinfo2.trg_type) { - parallel_print("error: unable to unpack external link value of obj1\n"); - goto out; - } - - /* get file name and obj path */ - if(H5Lunpack_elink_val(extlinkbuf2, li2.u.val_size, NULL, &extlink_file2, &extlink_path2)<0) - { - parallel_print("error: unable to unpack external link value of obj2\n"); + if (options->m_verbose||options->m_list_not_cmp) + { + parallel_print("<%s> is of type %s and <%s> is of type %s\n", path1, get_type(linkinfo1.trg_type), path2, get_type(linkinfo2.trg_type)); + } + options->not_cmp=1; goto out; } - nfound = h5diff(extlink_file1, extlink_file2, - extlink_path1, extlink_path2, options); - } + nfound = diff(file1_id, path1, + file2_id, path2, + options, linkinfo1.trg_type); + } - HDfree(extlinkbuf1); - HDfree(extlinkbuf2); + /* free link info buffer */ + HDfree(linkinfo1.trg_path); + HDfree(linkinfo2.trg_path); } /* end if */ - else + else { /* If one or both of these links isn't an external link, we can only * compare information from H5Lget_info since we don't have a query @@ -1643,7 +1571,8 @@ hsize_t diff(hid_t file1_id, * If the link classes or the buffer length are not the * same, the links are "different" */ - if((li1.type != li2.type) || (li1.u.val_size != li2.u.val_size)) + if((linkinfo1.linfo.type != linkinfo2.linfo.type) || + (linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size)) nfound = 1; else nfound = 0; @@ -1671,17 +1600,43 @@ hsize_t diff(hid_t file1_id, out: options->err_stat = 1; - /* free buf used for softlink */ - if (softlinkinfo1.buf) - HDfree(softlinkinfo1.buf); - if (softlinkinfo2.buf) - HDfree(softlinkinfo2.buf); - - /* free buf used for softlink */ - if (extlinkbuf1) - HDfree(extlinkbuf1); - if (extlinkbuf2) - HDfree(extlinkbuf2); +out2: + /*----------------------------------- + * handle dangling link(s) + */ + /* both path1 and path2 are dangling links */ + if(is_dangle_link1 && is_dangle_link2) + { + if(print_objname(options, nfound)) + { + do_print_objname("dangling link", path1, path2); + print_found(nfound); + } + } + /* path1 is dangling link */ + else if (is_dangle_link1) + { + if(options->m_verbose) + parallel_print("obj1 <%s> is a dangling link.\n", path1); + nfound++; + if(print_objname(options, nfound)) + print_found(nfound); + } + /* path2 is dangling link */ + else if (is_dangle_link2) + { + if(options->m_verbose) + parallel_print("obj2 <%s> is a dangling link.\n", path2); + nfound++; + if(print_objname(options, nfound)) + print_found(nfound); + } + + /* free link info buffer */ + if (linkinfo1.trg_path) + HDfree(linkinfo1.trg_path); + if (linkinfo2.trg_path) + HDfree(linkinfo2.trg_path); /* close */ /* disable error reporting */ diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index 090d3d9..6718d9a 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -35,7 +35,8 @@ typedef struct { double percent; /* relative error value */ int n; /* count, compare up to count */ hsize_t count; /* count value */ - int linkfollow; /* link follow*/ + int follow_links; /* follow symbolic links */ + int no_dangle_links; /* return error when find dangling link */ int err_stat; /* an error ocurred (1, error, 0, no error) */ int cmn_objs; /* do we have common objects */ int not_cmp; /* are the objects comparable */ -- cgit v0.12