From 7b54b0d7870f9120930f7d9daf8133c88c687127 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 14 Feb 2007 12:45:20 -0500 Subject: [svn-r13302] Description: Use the '-S' command line flag for h5ls, to make the output portable. Tested on: Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2) --- tools/h5copy/testh5copy.sh | 2 +- tools/testfiles/h5copytst.out.ls | 216 +++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh index 61839bb..210cebc 100644 --- a/tools/h5copy/testh5copy.sh +++ b/tools/h5copy/testh5copy.sh @@ -24,7 +24,7 @@ H5COPY_BIN=`pwd`/$H5COPY # The path of the tool binary H5DIFF=h5diff # The h5diff tool name H5DIFF_BIN=`pwd`/../h5diff/$H5DIFF # The path of the h5diff tool binary H5LS=h5ls # The h5ls tool name -H5LS_ARGS=-vr # Arguments to the h5ls tool +H5LS_ARGS=-Svr # Arguments to the h5ls tool H5LS_BIN=`pwd`/../h5ls/$H5LS # The path of the h5ls tool binary nerrors=0 diff --git a/tools/testfiles/h5copytst.out.ls b/tools/testfiles/h5copytst.out.ls index d2a6db7..a4ea111 100644 --- a/tools/testfiles/h5copytst.out.ls +++ b/tools/testfiles/h5copytst.out.ls @@ -11,18 +11,18 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /A/B1/simple Dataset {6/6} Location: 1:90216 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /A/B2 Group Location: 1:94600 Links: 1 /A/B2/simple2 Dataset {6/6} Location: 1:94472 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /C Group Location: 1:97816 Links: 1 @@ -32,9 +32,9 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /C/D/simple Dataset {6/6} Location: 1:97688 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /E Group Location: 1:103960 Links: 1 @@ -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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /E/F/grp_dsets/compact Dataset {6/6} Location: 1:103240 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /E/F/grp_dsets/compound Dataset {2/2} Location: 1:103376 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -69,37 +69,37 @@ 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /E/F/grp_dsets/named_vl Dataset {2/2} Location: 1:103808 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:103760 variable length of - native int + 32-bit little-endian integer /E/F/grp_dsets/nested_vl Dataset {2/2} Location: 1:112280 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /E/F/grp_dsets/simple Dataset {6/6} Location: 1:112424 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /E/F/grp_dsets/vl Type Location: 1:103760 Links: 2 Type: shared-1:103760 variable length of - native int + 32-bit little-endian integer /G Group Location: 1:128264 Links: 1 @@ -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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -137,54 +137,54 @@ 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /G/H/grp_nested/grp_dsets/named_vl Dataset {2/2} Location: 1:127536 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:123392 variable length of - native int + 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /G/H/grp_nested/grp_dsets/simple Dataset {6/6} Location: 1:127808 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /G/H/grp_nested/grp_dsets/vl Type Location: 1:123392 Links: 2 Type: shared-1:123392 variable length of - native int + 32-bit little-endian integer /chunk Dataset {6/6} Location: 1:6216 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /compact Dataset {6/6} Location: 1:6344 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /compound Dataset {2/2} Location: 1:8528 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -193,31 +193,31 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /compressed Dataset {6/6} Location: 1:12888 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /grp_dsets Group Location: 1:33760 Links: 1 /grp_dsets/chunk Dataset {6/6} Location: 1:35896 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_dsets/compact Dataset {6/6} Location: 1:36352 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_dsets/compound Dataset {2/2} Location: 1:36488 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -226,43 +226,43 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_dsets/compressed Dataset {6/6} Location: 1:36704 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /grp_dsets/named_vl Dataset {2/2} Location: 1:36920 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:36872 variable length of - native int + 32-bit little-endian integer /grp_dsets/nested_vl Dataset {2/2} Location: 1:45392 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /grp_dsets/simple Dataset {6/6} Location: 1:45536 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_dsets/simple_group Dataset {6/6} Location: 1:61744 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_dsets/vl Type Location: 1:36872 Links: 2 Type: shared-1:36872 variable length of - native int + 32-bit little-endian integer /grp_empty Group Location: 1:32968 Links: 1 @@ -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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_nested/grp_dsets/compact Dataset {6/6} Location: 1:51856 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_nested/grp_dsets/compound Dataset {2/2} Location: 1:51992 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -297,57 +297,57 @@ 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /grp_nested/grp_dsets/named_vl Dataset {2/2} Location: 1:58616 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:54472 variable length of - native int + 32-bit little-endian integer /grp_nested/grp_dsets/nested_vl Dataset {2/2} Location: 1:58744 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /grp_nested/grp_dsets/simple Dataset {6/6} Location: 1:58888 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_nested/grp_dsets/vl Type Location: 1:54472 Links: 2 Type: shared-1:54472 variable length of - native int + 32-bit little-endian integer /grp_rename Group Location: 1:62952 Links: 1 /grp_rename/chunk Dataset {6/6} Location: 1:65088 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/compact Dataset {6/6} Location: 1:65544 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/compound Dataset {2/2} Location: 1:65680 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -356,31 +356,31 @@ Opened "../testfiles/h5copytst.out.h5" with sec2 driver. /grp_rename/compressed Dataset {6/6} Location: 1:65896 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /grp_rename/grp_dsets Group Location: 1:75936 Links: 1 /grp_rename/grp_dsets/chunk Dataset {6/6} Location: 1:78072 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/grp_dsets/compact Dataset {6/6} Location: 1:78528 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/grp_dsets/compound Dataset {2/2} Location: 1:78664 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 80 logical bytes, 80 allocated bytes, 100.00% utilization Type: struct { "str1" +0 20-byte null-terminated ASCII string @@ -389,82 +389,82 @@ 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Chunks: {2} 8 bytes Storage: 24 logical bytes, 42 allocated bytes, 57.14% utilization Filter-0: deflate-1 OPT {1} - Type: native int + Type: 32-bit little-endian integer /grp_rename/grp_dsets/named_vl Dataset {2/2} Location: 1:79096 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:79048 variable length of - native int + 32-bit little-endian integer /grp_rename/grp_dsets/nested_vl Dataset {2/2} Location: 1:87568 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /grp_rename/grp_dsets/simple Dataset {6/6} Location: 1:87712 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/grp_dsets/vl Type Location: 1:79048 Links: 2 Type: shared-1:79048 variable length of - native int + 32-bit little-endian integer /grp_rename/named_vl Dataset {2/2} Location: 1:66112 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:66064 variable length of - native int + 32-bit little-endian integer /grp_rename/nested_vl Dataset {2/2} Location: 1:74584 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /grp_rename/simple Dataset {6/6} Location: 1:74728 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /grp_rename/vl Type Location: 1:66064 Links: 2 Type: shared-1:66064 variable length of - native int + 32-bit little-endian integer /named_vl Dataset {2/2} Location: 1:13104 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: shared-1:13056 variable length of - native int + 32-bit little-endian integer /nested_vl Dataset {2/2} Location: 1:27392 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 16 logical bytes, 32 allocated bytes, 50.00% utilization Type: variable length of variable length of - native int + 32-bit little-endian integer /rename Dataset {2/2} Location: 1:31760 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT 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 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer /simple_top Dataset {6/6} Location: 1:29584 Links: 1 - Modified: 2007-02-14 10:56:03 CST + Modified: 2007-02-14 16:56:03 GMT Storage: 24 logical bytes, 24 allocated bytes, 100.00% utilization - Type: native int + Type: 32-bit little-endian integer -- cgit v0.12