diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-06 19:45:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-06 19:45:35 (GMT) |
| commit | 98754fa9d12090f5e048fdb05cc5e9ce9111676f (patch) | |
| tree | 407e611b19ee551d8153779104022dd886a467e5 /tools/h5diff/testfiles/h5diff_10.txt | |
| parent | 29321bcafa9f1c6108bb92b5a844a9d4d9c2c8e7 (diff) | |
| download | hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.zip hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.tar.gz hdf5-98754fa9d12090f5e048fdb05cc5e9ce9111676f.tar.bz2 | |
[svn-r19050] Description:
Bring r18704:19049 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, in production 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.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools/h5diff/testfiles/h5diff_10.txt')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_10.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt index aeba845..d3ee9a6 100644 --- a/tools/h5diff/testfiles/h5diff_10.txt +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -10,7 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] -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) + --follow-symlinks 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 @@ -21,13 +21,13 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] - 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, + --no-dangling-links is used with --follow-symlinks, 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, + --no-dangling-links is used with --follow-symlinks, this situation is treated as an error and h5diff returns an exit code of 2. - If both symbolic links point to existing objects, @@ -35,7 +35,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 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; + --no-dangling-links Must be used with --follow-symlinks option; otherwise, h5diff shows error message and returns an exit code of 2. Check for any symbolic links (soft links or external @@ -78,7 +78,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 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). + (refer to --follow-symlinks option). Exit code: 0 if no differences, 1 if differences found, 2 if error |