summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-02-14 20:30:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-02-14 20:30:41 (GMT)
commitcec2dd60858ea736f050f1f2dccf229331d6cafc (patch)
treefac371c39224e684b2005c2eb193d4e149930c73
parent9c9bebf83993e9d35551a3d0f53f6d06a2f0cf9f (diff)
downloadhdf5-cec2dd60858ea736f050f1f2dccf229331d6cafc.zip
hdf5-cec2dd60858ea736f050f1f2dccf229331d6cafc.tar.gz
hdf5-cec2dd60858ea736f050f1f2dccf229331d6cafc.tar.bz2
[svn-r13306] Description:
Mask off the storage utilization for the h5ls output, so that the h5ls output is more portable (VL datatype size is reported as the memory size instead of the file size, making the storage utilization incorrect - entered in bugzilla) Tested on: Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2)
-rw-r--r--tools/h5copy/testh5copy.sh5
-rw-r--r--tools/testfiles/h5copytst.out.ls110
2 files changed, 59 insertions, 56 deletions
diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh
index 792ad9f..e3cf67d 100644
--- a/tools/h5copy/testh5copy.sh
+++ b/tools/h5copy/testh5copy.sh
@@ -142,13 +142,16 @@ H5LSTEST()
# Stderr is included in stdout so that the diff can detect
# any unexpected output from that stream too.
+ #
+ # Note: The modification time and storage utilization are masked off
+ # so that the output is more portable
VERIFY_H5LS $@
(
echo "#############################"
echo "Expected output for '$H5LS $@'"
echo "#############################"
$RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
- ) 2>&1 |sed 's/Modified:.*/Modified: XXXX-XX-XX XX:XX:XX XXX/' >$actual
+ ) 2>&1 |sed 's/Modified:.*/Modified: XXXX-XX-XX XX:XX:XX XXX/' |sed 's/Storage:.*/Storage: <details removed for portability>/' >$actual
if [ ! -f $expect ]; then
diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls
index 8b7e1bb..1e8cd16 100644
--- a/tools/testfiles/h5copytst.out.ls
+++ b/tools/testfiles/h5copytst.out.ls
@@ -12,7 +12,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:90216
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/A/B2 Group
Location: 1:94600
@@ -21,7 +21,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:94472
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/C Group
Location: 1:97816
@@ -33,7 +33,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:97688
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E Group
Location: 1:103960
@@ -49,19 +49,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compact Dataset {6/6}
Location: 1:103240
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/compound Dataset {2/2}
Location: 1:103376
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -71,21 +71,21 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/E/F/grp_dsets/named_vl Dataset {2/2}
Location: 1:103808
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:103760 variable length of
32-bit little-endian integer
/E/F/grp_dsets/nested_vl Dataset {2/2}
Location: 1:112280
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -93,7 +93,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:112424
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/E/F/grp_dsets/vl Type
Location: 1:103760
@@ -117,19 +117,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compact Dataset {6/6}
Location: 1:120776
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/compound Dataset {2/2}
Location: 1:120912
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -139,21 +139,21 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/named_vl Dataset {2/2}
Location: 1:127536
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:123392 variable length of
32-bit little-endian integer
/G/H/grp_nested/grp_dsets/nested_vl Dataset {2/2}
Location: 1:127664
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -161,7 +161,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:127808
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/G/H/grp_nested/grp_dsets/vl Type
Location: 1:123392
@@ -173,19 +173,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/compact Dataset {6/6}
Location: 1:6344
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/compound Dataset {2/2}
Location: 1:8528
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -195,7 +195,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_dsets Group
@@ -206,19 +206,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compact Dataset {6/6}
Location: 1:36352
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/compound Dataset {2/2}
Location: 1:36488
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -228,21 +228,21 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_dsets/named_vl Dataset {2/2}
Location: 1:36920
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:36872 variable length of
32-bit little-endian integer
/grp_dsets/nested_vl Dataset {2/2}
Location: 1:45392
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -250,13 +250,13 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:45536
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/simple_group Dataset {6/6}
Location: 1:61744
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_dsets/vl Type
Location: 1:36872
@@ -277,19 +277,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compact Dataset {6/6}
Location: 1:51856
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/compound Dataset {2/2}
Location: 1:51992
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -299,21 +299,21 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/named_vl Dataset {2/2}
Location: 1:58616
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:54472 variable length of
32-bit little-endian integer
/grp_nested/grp_dsets/nested_vl Dataset {2/2}
Location: 1:58744
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -321,7 +321,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:58888
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_nested/grp_dsets/vl Type
Location: 1:54472
@@ -336,19 +336,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compact Dataset {6/6}
Location: 1:65544
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/compound Dataset {2/2}
Location: 1:65680
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -358,7 +358,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_rename/grp_dsets Group
@@ -369,19 +369,19 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compact Dataset {6/6}
Location: 1:78528
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/compound Dataset {2/2}
Location: 1:78664
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -391,21 +391,21 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
Chunks: {2} 8 bytes
- Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization
+ Storage: <details removed for portability>
Filter-0: deflate-1 OPT {1}
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/named_vl Dataset {2/2}
Location: 1:79096
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:79048 variable length of
32-bit little-endian integer
/grp_rename/grp_dsets/nested_vl Dataset {2/2}
Location: 1:87568
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -413,7 +413,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:87712
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/grp_dsets/vl Type
Location: 1:79048
@@ -424,14 +424,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:66112
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:66064 variable length of
32-bit little-endian integer
/grp_rename/nested_vl Dataset {2/2}
Location: 1:74584
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -439,7 +439,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:74728
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/grp_rename/vl Type
Location: 1:66064
@@ -450,14 +450,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:13104
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: shared-1:13056 variable length of
32-bit little-endian integer
/nested_vl Dataset {2/2}
Location: 1:27392
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization
+ Storage: <details removed for portability>
Type: variable length of
variable length of
32-bit little-endian integer
@@ -465,7 +465,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:31760
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: struct {
"str1" +0 20-byte null-terminated ASCII string
"str2" +20 20-byte null-terminated ASCII string
@@ -474,11 +474,11 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver.
Location: 1:808
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer
/simple_top Dataset {6/6}
Location: 1:29584
Links: 1
Modified: XXXX-XX-XX XX:XX:XX XXX
- Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization
+ Storage: <details removed for portability>
Type: 32-bit little-endian integer