From efc45d5aab2fbdbad1f7bf494db91f9257a3285e Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 14 Feb 2007 12:56:26 -0500 Subject: [svn-r13303] Description: Blank out the modification time, to eliminate another portability issue. Tested on: Linux/32 2.6 (chicago) FreeBSD/32 6.2 (duty) Mac OS X/32 10.4.8 (amazon) --- tools/h5copy/testh5copy.sh | 2 +- tools/testfiles/h5copytst.out.ls | 110 +++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index 210cebc..792ad9f 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -148,7 +148,7 @@ H5LSTEST() echo "Expected output for '$H5LS $@'" echo "#############################" $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@ - ) 2>&1 >$actual + ) 2>&1 |sed 's/Modified:.*/Modified: XXXX-XX-XX XX:XX:XX XXX/' >$actual if [ ! -f $expect ]; then diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls index a4ea111..8b7e1bb 100644 --- a/tools/testfiles/h5copytst.out.ls +++ b/tools/testfiles/h5copytst.out.ls @@ -11,7 +11,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /A/B1/simple Dataset {6/6} Location: 1:90216 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /A/B2 Group @@ -20,7 +20,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /A/B2/simple2 Dataset {6/6} Location: 1:94472 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /C Group @@ -32,7 +32,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /C/D/simple Dataset {6/6} Location: 1:97688 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /E Group @@ -47,20 +47,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /E/F/grp_dsets/chunk Dataset {6/6} Location: 1:102784 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /E/F/grp_dsets/compact Dataset {6/6} Location: 1:103240 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /E/F/grp_dsets/compound Dataset {2/2} Location: 1:103376 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -69,7 +69,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /E/F/grp_dsets/compressed Dataset {6/6} Location: 1:103592 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -77,14 +77,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /E/F/grp_dsets/named_vl Dataset {2/2} Location: 1:103808 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -92,7 +92,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /E/F/grp_dsets/simple Dataset {6/6} Location: 1:112424 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /E/F/grp_dsets/vl Type @@ -115,20 +115,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /G/H/grp_nested/grp_dsets/chunk Dataset {6/6} Location: 1:118176 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /G/H/grp_nested/grp_dsets/compact Dataset {6/6} Location: 1:120776 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /G/H/grp_nested/grp_dsets/compound Dataset {2/2} Location: 1:120912 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -137,7 +137,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /G/H/grp_nested/grp_dsets/compressed Dataset {6/6} Location: 1:123224 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -145,14 +145,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2} Location: 1:127536 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -160,7 +160,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /G/H/grp_nested/grp_dsets/simple Dataset {6/6} Location: 1:127808 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /G/H/grp_nested/grp_dsets/vl Type @@ -171,20 +171,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /chunk Dataset {6/6} Location: 1:6216 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /compact Dataset {6/6} Location: 1:6344 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /compound Dataset {2/2} Location: 1:8528 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -193,7 +193,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /compressed Dataset {6/6} Location: 1:12888 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -204,20 +204,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_dsets/chunk Dataset {6/6} Location: 1:35896 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_dsets/compact Dataset {6/6} Location: 1:36352 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_dsets/compound Dataset {2/2} Location: 1:36488 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -226,7 +226,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_dsets/compressed Dataset {6/6} Location: 1:36704 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -234,14 +234,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_dsets/named_vl Dataset {2/2} Location: 1:36920 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -249,13 +249,13 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_dsets/simple Dataset {6/6} Location: 1:45536 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_dsets/simple_group Dataset {6/6} Location: 1:61744 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_dsets/vl Type @@ -275,20 +275,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_nested/grp_dsets/chunk Dataset {6/6} Location: 1:49256 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_nested/grp_dsets/compact Dataset {6/6} Location: 1:51856 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_nested/grp_dsets/compound Dataset {2/2} Location: 1:51992 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -297,7 +297,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_nested/grp_dsets/compressed Dataset {6/6} Location: 1:54304 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -305,14 +305,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_nested/grp_dsets/named_vl Dataset {2/2} Location: 1:58616 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -320,7 +320,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_nested/grp_dsets/simple Dataset {6/6} Location: 1:58888 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_nested/grp_dsets/vl Type @@ -334,20 +334,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/chunk Dataset {6/6} Location: 1:65088 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/compact Dataset {6/6} Location: 1:65544 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/compound Dataset {2/2} Location: 1:65680 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -356,7 +356,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/compressed Dataset {6/6} Location: 1:65896 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -367,20 +367,20 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/grp_dsets/chunk Dataset {6/6} Location: 1:78072 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/grp_dsets/compact Dataset {6/6} Location: 1:78528 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/grp_dsets/compound Dataset {2/2} Location: 1:78664 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -389,7 +389,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/grp_dsets/compressed Dataset {6/6} Location: 1:78880 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} @@ -397,14 +397,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/grp_dsets/named_vl Dataset {2/2} Location: 1:79096 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -412,7 +412,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/grp_dsets/simple Dataset {6/6} Location: 1:87712 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/grp_dsets/vl Type @@ -423,14 +423,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/named_vl Dataset {2/2} Location: 1:66112 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization 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: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -438,7 +438,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/simple Dataset {6/6} Location: 1:74728 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /grp_rename/vl Type @@ -449,14 +449,14 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /named_vl Dataset {2/2} Location: 1:13104 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:13056 variable length of 32-bit little-endian integer /nested_vl Dataset {2/2} Location: 1:27392 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of @@ -464,7 +464,7 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /rename Dataset {2/2} Location: 1:31760 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -473,12 +473,12 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /simple Dataset {6/6} Location: 1:808 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer /simple_top Dataset {6/6} Location: 1:29584 Links: 1 - Modified: 2007-02-14 16:56:03 GMT + Modified: XXXX-XX-XX XX:XX:XX XXX Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization Type: 32-bit little-endian integer -- cgit v0.12