[svn-r19543] Description:

Bring r19411:19542 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
This commit is contained in:
Quincey Koziol
2010-10-07 20:55:21 -05:00
parent 6747ebd985
commit 3c470c9db6
156 changed files with 6383 additions and 2462 deletions

View File

@@ -453,6 +453,30 @@ void usage(void)
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(" --exclude-path \"path\" Exclude the specified path to an object when\n");
printf(" comparing files or groups. If a group is excluded,\n");
printf(" all member objects will also be excluded.\n");
printf(" The specified path is excluded wherever it occurs.\n");
printf(" This flexibility enables the same option to exclude\n");
printf(" either objects that exist only in one file or\n");
printf(" common objects that are known to differ.\n");
printf("\n");
printf(" When comparing files, \"path\" is the absolute path to\n");
printf(" the excluded object; when comparing groups, \"path\" is\n");
printf(" similar to the relative path from the group to the\n");
printf(" excluded object. This \"path\" can be taken from the\n");
printf(" first section of the output of the --verbose option.\n");
printf(" For example, if you are comparing the group /groupA\n");
printf(" in two files and you want to exclude\n");
printf(" /groupA/groupB/groupC in both files, the exclude\n");
printf(" option would read as follows:\n");
printf(" --exclude-path \"/groupB/groupC\"\n");
printf("\n");
printf(" If there are multiple paths to an object, only the\n");
printf(" specified path(s) will be excluded; the comparison\n");
printf(" will include any path not explicitly excluded.\n");
printf(" This option can be used repeatedly to exclude\n");
printf(" multiple paths.\n");
printf("\n");
printf(" Modes of output:\n");