From aa668a4f6438fc1eed958a8a27bad7795b2b383e Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Fri, 25 Mar 2011 12:02:03 -0500 Subject: [svn-r20334] Purpose: Fixed CHICAGO: Bug 2121 - h5diff - incorrect and lack of output for the different set of attributes (different number and names) Description: This is related to previous checkin r20294. Add help page update for verbose option level feature, which displays useful information about attribute difference with -v1, --verbose=1 -v2 or --verbose=2 option. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE) --- release_docs/RELEASE.txt | 4 ++++ tools/h5diff/h5diff_common.c | 11 ++++++++++- tools/h5diff/testfiles/h5diff_10.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_600.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_603.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_606.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_612.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_615.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_621.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_622.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_623.txt | 11 ++++++++++- tools/h5diff/testfiles/h5diff_624.txt | 11 ++++++++++- 12 files changed, 114 insertions(+), 11 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 6f5a73d..8f9652d 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -189,6 +189,10 @@ New Features Tools: ------ + - h5diff: Added new level for -v (verbose) option. The new levels are + 1 and 2. So -v1 and -v2 can be specified to view more + information about attributes differences. + Bug#2121 (JKM 2011/3/23) - h5dump: Added new option --enable-error-stack. This option will display error stack information in the output stream. This is useful when the "h5dump: Unable to print data" message is output. diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index da45a31..da420b0 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -433,7 +433,16 @@ void usage(void) 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(" -v --verbose Verbose mode. Print differences information and list\n"); + printf(" of objects.\n"); + printf(" -vN --verbose=N Verbose mode with level. Print differences and list\n"); + printf(" of objects.\n"); + printf(" Level of detail depends on value of N:\n"); + printf(" 0 : Identical to '-v' or '--verbose'.\n"); + printf(" 1 : All level 0 information plus one-line attribute\n"); + printf(" status summary.\n"); + printf(" 2 : All level 1 information plus extended attribute\n"); + printf(" status report.\n"); printf(" -q, --quiet Quiet mode. Do not produce output.\n"); printf(" --follow-symlinks Follow symbolic links (soft links and external links)\n"); printf(" and compare the links' target objects.\n"); diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt index 4dae480..0b354df 100644 --- a/tools/h5diff/testfiles/h5diff_10.txt +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -8,7 +8,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt index ea767fc..efc05a8 100644 --- a/tools/h5diff/testfiles/h5diff_600.txt +++ b/tools/h5diff/testfiles/h5diff_600.txt @@ -8,7 +8,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt index 1c48c8b..c66c650 100644 --- a/tools/h5diff/testfiles/h5diff_603.txt +++ b/tools/h5diff/testfiles/h5diff_603.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt index 8f3bbd6..705ae3e 100644 --- a/tools/h5diff/testfiles/h5diff_606.txt +++ b/tools/h5diff/testfiles/h5diff_606.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt index e348caa..d38e9d4 100644 --- a/tools/h5diff/testfiles/h5diff_612.txt +++ b/tools/h5diff/testfiles/h5diff_612.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt index 1bb0eb5..4b95ea1 100644 --- a/tools/h5diff/testfiles/h5diff_615.txt +++ b/tools/h5diff/testfiles/h5diff_615.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt index 172cade..56ed724 100644 --- a/tools/h5diff/testfiles/h5diff_621.txt +++ b/tools/h5diff/testfiles/h5diff_621.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt index beb04c5..6e2db1b 100644 --- a/tools/h5diff/testfiles/h5diff_622.txt +++ b/tools/h5diff/testfiles/h5diff_622.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt index 56c0b4c..910f4f0 100644 --- a/tools/h5diff/testfiles/h5diff_623.txt +++ b/tools/h5diff/testfiles/h5diff_623.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt index c0a95ed..e301645 100644 --- a/tools/h5diff/testfiles/h5diff_624.txt +++ b/tools/h5diff/testfiles/h5diff_624.txt @@ -9,7 +9,16 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] -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. + -v --verbose Verbose mode. Print differences information and list + of objects. + -vN --verbose=N Verbose mode with level. Print differences and list + of objects. + Level of detail depends on value of N: + 0 : Identical to '-v' or '--verbose'. + 1 : All level 0 information plus one-line attribute + status summary. + 2 : All level 1 information plus extended attribute + status report. -q, --quiet Quiet mode. Do not produce output. --follow-symlinks Follow symbolic links (soft links and external links) and compare the links' target objects. -- cgit v0.12