From 072143ba88da8184334e1cd89f0876de01e69ce2 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 20 Jul 1999 16:43:16 -0500 Subject: [PATCH] [svn-r1519] Updated the expected output according to the changes Patrick just made. --- tools/testfiles/tstr-1.ddl | 158 ++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl index a7bd399e77..53fe0fa185 100644 --- a/tools/testfiles/tstr-1.ddl +++ b/tools/testfiles/tstr-1.ddl @@ -5,25 +5,16 @@ HDF5 "tstr.h5" { GROUP "/" { DATASET "comp1" { DATATYPE { + H5T_STD_I32BE "int_array"[8][10]; { STRSIZE 32; STRPAD H5T_STR_SPACEPAD; CSET H5T_CSET_ASCII; CTYPE H5T_C_S1; } "string"[3][4]; - H5T_STD_I32BE "int_array"[8][10]; } DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } DATA { { - [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // - "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678", - "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // - "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678", - "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // - "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, @@ -31,9 +22,7 @@ GROUP "/" { 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, - 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ] - }, - { + 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -42,7 +31,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, @@ -50,9 +41,7 @@ GROUP "/" { 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, - 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ] - }, - { + 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -61,7 +50,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, @@ -69,9 +60,7 @@ GROUP "/" { 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, - 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ] - }, - { + 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -80,7 +69,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, @@ -88,9 +79,7 @@ GROUP "/" { 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, - 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ] - }, - { + 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -99,7 +88,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, @@ -107,9 +98,7 @@ GROUP "/" { 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, - 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ] - }, - { + 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -118,7 +107,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, @@ -126,9 +117,7 @@ GROUP "/" { 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 121, 144, 169, 196, 225, 256, 289, 324, 361, 400, - 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ] - }, - { + 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -137,7 +126,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, @@ -145,9 +136,7 @@ GROUP "/" { 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, - 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ] - }, - { + 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -156,7 +145,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, @@ -164,9 +155,7 @@ GROUP "/" { 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, - 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ] - }, - { + 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -175,7 +164,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, @@ -183,9 +174,7 @@ GROUP "/" { 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, - 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ] - }, - { + 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -194,7 +183,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, @@ -202,9 +193,7 @@ GROUP "/" { 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, - 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ] - }, - { + 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -213,7 +202,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, @@ -221,9 +212,7 @@ GROUP "/" { 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, - 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ] - }, - { + 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -232,7 +221,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, @@ -240,9 +231,7 @@ GROUP "/" { 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 121, 144, 169, 196, 225, 256, 289, 324, 361, 400, - 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ] - }, - { + 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -251,7 +240,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, @@ -259,9 +250,7 @@ GROUP "/" { 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, - 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ] - }, - { + 49, 64, 81, 100, 121, 144, 169, 196, 225, 256 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -270,7 +259,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, @@ -278,9 +269,7 @@ GROUP "/" { 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, - 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ] - }, - { + 64, 81, 100, 121, 144, 169, 196, 225, 256, 289 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -289,7 +278,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 4, 9, 16, 25, 36, 49, 64, 81, 100, 121, 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, @@ -297,9 +288,7 @@ GROUP "/" { 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, - 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ] - }, - { + 81, 100, 121, 144, 169, 196, 225, 256, 289, 324 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -308,7 +297,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 9, 16, 25, 36, 49, 64, 81, 100, 121, 144, 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, @@ -316,9 +307,7 @@ GROUP "/" { 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, - 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ] - }, - { + 100, 121, 144, 169, 196, 225, 256, 289, 324, 361 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -327,7 +316,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 16, 25, 36, 49, 64, 81, 100, 121, 144, 169, 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, @@ -335,9 +326,7 @@ GROUP "/" { 64, 81, 100, 121, 144, 169, 196, 225, 256, 289, 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, - 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ] - }, - { + 121, 144, 169, 196, 225, 256, 289, 324, 361, 400 ], [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // "78abcdefgh12345678", @@ -346,7 +335,9 @@ GROUP "/" { "78abcdefgh12345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // - "78abcdefgh12345678" ], + "78abcdefgh12345678" ] + }, + { [ 25, 36, 49, 64, 81, 100, 121, 144, 169, 196, 36, 49, 64, 81, 100, 121, 144, 169, 196, 225, 49, 64, 81, 100, 121, 144, 169, 196, 225, 256, @@ -354,7 +345,16 @@ GROUP "/" { 81, 100, 121, 144, 169, 196, 225, 256, 289, 324, 100, 121, 144, 169, 196, 225, 256, 289, 324, 361, 121, 144, 169, 196, 225, 256, 289, 324, 361, 400, - 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ] + 144, 169, 196, 225, 256, 289, 324, 361, 400, 441 ], + [ "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // + "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // + "78abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // + "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // + "78abcdefgh12345678", + "abcdefgh12345678abcdefgh12345678", "abcdefgh12345678abcdefgh1" // + "2345678", "abcdefgh12345678abcdefgh12345678", "abcdefgh123456" // + "78abcdefgh12345678" ] } } }