[svn-r20383] Description:
Bring r19714:20382 from trunk to revise_chunks branch
Tested:
Linux 2.6/64 (chicago)
This commit is contained in:
Quincey Koziol
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2038
tools/h5diff/testfiles/h5diff_700.txt
Normal file
2038
tools/h5diff/testfiles/h5diff_700.txt
Normal file
File diff suppressed because it is too large
Load Diff
2137
tools/h5diff/testfiles/h5diff_701.txt
Normal file
2137
tools/h5diff/testfiles/h5diff_701.txt
Normal file
File diff suppressed because it is too large
Load Diff
2038
tools/h5diff/testfiles/h5diff_702.txt
Normal file
2038
tools/h5diff/testfiles/h5diff_702.txt
Normal file
File diff suppressed because it is too large
Load Diff
2137
tools/h5diff/testfiles/h5diff_703.txt
Normal file
2137
tools/h5diff/testfiles/h5diff_703.txt
Normal file
File diff suppressed because it is too large
Load Diff
28
tools/h5diff/testfiles/h5diff_704.txt
Normal file
28
tools/h5diff/testfiles/h5diff_704.txt
Normal file
@@ -0,0 +1,28 @@
|
||||
|
||||
group1 group2
|
||||
---------------------------------------
|
||||
x x
|
||||
|
||||
|
||||
group : </g> and </g>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x x float1
|
||||
x x integer1
|
||||
Attributes status: 2 common, 0 only in obj1, 0 only in obj2
|
||||
attribute: <float1 of </g>> and <float1 of </g>>
|
||||
size: [2] [2]
|
||||
position float1 of </g> float1 of </g> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1.1 2.1 1
|
||||
[ 1 ] 2.2 3.2 1
|
||||
2 differences found
|
||||
attribute: <integer1 of </g>> and <integer1 of </g>>
|
||||
size: [2] [2]
|
||||
position integer1 of </g> integer1 of </g> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
EXIT CODE: 1
|
||||
17
tools/h5diff/testfiles/h5diff_705.txt
Normal file
17
tools/h5diff/testfiles/h5diff_705.txt
Normal file
@@ -0,0 +1,17 @@
|
||||
|
||||
dataset: </dset> and </dset>
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float2
|
||||
x float3
|
||||
x x integer1
|
||||
Attributes status: 1 common, 1 only in obj1, 1 only in obj2
|
||||
attribute: <integer1 of </dset>> and <integer1 of </dset>>
|
||||
size: [2] [2]
|
||||
position integer1 of </dset> integer1 of </dset> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
2 differences found
|
||||
EXIT CODE: 1
|
||||
13
tools/h5diff/testfiles/h5diff_706.txt
Normal file
13
tools/h5diff/testfiles/h5diff_706.txt
Normal file
@@ -0,0 +1,13 @@
|
||||
|
||||
datatype: </ntype> and </ntype>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float2
|
||||
x float3
|
||||
x float5
|
||||
x float6
|
||||
x integer1
|
||||
x integer4
|
||||
Attributes status: 0 common, 3 only in obj1, 3 only in obj2
|
||||
EXIT CODE: 0
|
||||
29
tools/h5diff/testfiles/h5diff_707.txt
Normal file
29
tools/h5diff/testfiles/h5diff_707.txt
Normal file
@@ -0,0 +1,29 @@
|
||||
|
||||
group1 group2
|
||||
---------------------------------------
|
||||
x x
|
||||
|
||||
|
||||
group : </g2> and </g2>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x x float2
|
||||
x float3
|
||||
x x integer1
|
||||
Attributes status: 2 common, 1 only in obj1, 0 only in obj2
|
||||
attribute: <float2 of </g2>> and <float2 of </g2>>
|
||||
size: [2] [2]
|
||||
position float2 of </g2> float2 of </g2> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1.1 2.1 1
|
||||
[ 1 ] 2.2 3.2 1
|
||||
2 differences found
|
||||
attribute: <integer1 of </g2>> and <integer1 of </g2>>
|
||||
size: [2] [2]
|
||||
position integer1 of </g2> integer1 of </g2> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
EXIT CODE: 1
|
||||
17
tools/h5diff/testfiles/h5diff_708.txt
Normal file
17
tools/h5diff/testfiles/h5diff_708.txt
Normal file
@@ -0,0 +1,17 @@
|
||||
|
||||
group1 group2
|
||||
---------------------------------------
|
||||
x x
|
||||
|
||||
|
||||
group : </g3> and </g3>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float11
|
||||
x float12
|
||||
x float4
|
||||
x integer10
|
||||
x integer3
|
||||
Attributes status: 0 common, 3 only in obj1, 2 only in obj2
|
||||
EXIT CODE: 0
|
||||
12
tools/h5diff/testfiles/h5diff_709.txt
Normal file
12
tools/h5diff/testfiles/h5diff_709.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
|
||||
group1 group2
|
||||
---------------------------------------
|
||||
x x
|
||||
|
||||
|
||||
group : </g4> and </g4>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
|
||||
EXIT CODE: 0
|
||||
108
tools/h5diff/testfiles/h5diff_710.txt
Normal file
108
tools/h5diff/testfiles/h5diff_710.txt
Normal file
@@ -0,0 +1,108 @@
|
||||
|
||||
file1 file2
|
||||
---------------------------------------
|
||||
x x /
|
||||
x x /dset
|
||||
x x /g
|
||||
x x /g2
|
||||
x x /g3
|
||||
x x /g4
|
||||
x x /ntype
|
||||
|
||||
|
||||
group : </> and </>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
|
||||
|
||||
dataset: </dset> and </dset>
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float2
|
||||
x float3
|
||||
x x integer1
|
||||
Attributes status: 1 common, 1 only in obj1, 1 only in obj2
|
||||
attribute: <integer1 of </dset>> and <integer1 of </dset>>
|
||||
size: [2] [2]
|
||||
position integer1 of </dset> integer1 of </dset> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
2 differences found
|
||||
|
||||
group : </g> and </g>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x x float1
|
||||
x x integer1
|
||||
Attributes status: 2 common, 0 only in obj1, 0 only in obj2
|
||||
attribute: <float1 of </g>> and <float1 of </g>>
|
||||
size: [2] [2]
|
||||
position float1 of </g> float1 of </g> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1.1 2.1 1
|
||||
[ 1 ] 2.2 3.2 1
|
||||
2 differences found
|
||||
attribute: <integer1 of </g>> and <integer1 of </g>>
|
||||
size: [2] [2]
|
||||
position integer1 of </g> integer1 of </g> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
|
||||
group : </g2> and </g2>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x x float2
|
||||
x float3
|
||||
x x integer1
|
||||
Attributes status: 2 common, 1 only in obj1, 0 only in obj2
|
||||
attribute: <float2 of </g2>> and <float2 of </g2>>
|
||||
size: [2] [2]
|
||||
position float2 of </g2> float2 of </g2> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1.1 2.1 1
|
||||
[ 1 ] 2.2 3.2 1
|
||||
2 differences found
|
||||
attribute: <integer1 of </g2>> and <integer1 of </g2>>
|
||||
size: [2] [2]
|
||||
position integer1 of </g2> integer1 of </g2> difference
|
||||
------------------------------------------------------------
|
||||
[ 0 ] 1 2 1
|
||||
[ 1 ] 2 3 1
|
||||
2 differences found
|
||||
|
||||
group : </g3> and </g3>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float11
|
||||
x float12
|
||||
x float4
|
||||
x integer10
|
||||
x integer3
|
||||
Attributes status: 0 common, 3 only in obj1, 2 only in obj2
|
||||
|
||||
group : </g4> and </g4>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
|
||||
|
||||
datatype: </ntype> and </ntype>
|
||||
0 differences found
|
||||
obj1 obj2
|
||||
--------------------------------------
|
||||
x float2
|
||||
x float3
|
||||
x float5
|
||||
x float6
|
||||
x integer1
|
||||
x integer4
|
||||
Attributes status: 0 common, 3 only in obj1, 3 only in obj2
|
||||
EXIT CODE: 1
|
||||
BIN
tools/h5diff/testfiles/h5diff_attr_v_level1.h5
Normal file
BIN
tools/h5diff/testfiles/h5diff_attr_v_level1.h5
Normal file
Binary file not shown.
BIN
tools/h5diff/testfiles/h5diff_attr_v_level2.h5
Normal file
BIN
tools/h5diff/testfiles/h5diff_attr_v_level2.h5
Normal file
Binary file not shown.
Reference in New Issue
Block a user