diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-06 17:49:30 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-06 17:49:30 (GMT) |
commit | 0a57cb562c116683529013c158f6873ebd5b9c34 (patch) | |
tree | 9da832cf2a41c7322dd259ffe717515e6ff0d663 /tools/testfiles | |
parent | c95332e8aeacc5551d3c9541256afd98d89b01d7 (diff) | |
download | hdf5-0a57cb562c116683529013c158f6873ebd5b9c34.zip hdf5-0a57cb562c116683529013c158f6873ebd5b9c34.tar.gz hdf5-0a57cb562c116683529013c158f6873ebd5b9c34.tar.bz2 |
[svn-r29291] Merge of r29226-29259 from trunk.
Mostly java JNI + a few smaller merges.
Tested on: h5committest.new
jam w/ java
Diffstat (limited to 'tools/testfiles')
-rw-r--r-- | tools/testfiles/h5dump-help.txt | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tnofilename-with-packed-bits.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsIncomplete.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsLengthExceeded.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsLengthPositive.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsMaxExceeded.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsOffsetExceeded.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/pbits/tpbitsOffsetNegative.ddl | 2 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-1.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-2.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-3_1.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-3_2.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-4.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/tvds_layout-5.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/vds_layout-eiger.ddl | 6 | ||||
-rw-r--r-- | tools/testfiles/vds/vds_layout-maxmin.ddl | 6 |
16 files changed, 8 insertions, 56 deletions
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt index 7ebefc6..fe22a1b 100644 --- a/tools/testfiles/h5dump-help.txt +++ b/tools/testfiles/h5dump-help.txt @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl index 1a1b7e8..767cbbf 100644 --- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl +++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl index 2a2778a..d791b41 100644 --- a/tools/testfiles/pbits/tpbitsIncomplete.ddl +++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl index 5e00073..5235aa7 100644 --- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl index f2574d4..697bff8 100644 --- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl +++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl index 15c0abc..900c0b5 100644 --- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl index c62e290..65123d0 100644 --- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl index 5621a60..d352e34 100644 --- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl @@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files -o F, --output=F Output raw data into file F -b B, --binary=B Binary file output, of form B -O F, --ddl=F Output ddl text into file F - Do not use filename F to suppress ddl display + Use blank(empty) filename F to suppress ddl display --------------- Object Options --------------- -a P, --attribute=P Print the specified attribute If an attribute name contains a slash (/), escape the diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/testfiles/vds/tvds_layout-1.ddl index 5d8a62c..b5351f2 100644 --- a/tools/testfiles/vds/tvds_layout-1.ddl +++ b/tools/testfiles/vds/tvds_layout-1.ddl @@ -125,16 +125,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): 10, 10, 10, 10, 10, 10, 10, 10, (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10, diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/testfiles/vds/tvds_layout-2.ddl index af6b718..53407c7 100644 --- a/tools/testfiles/vds/tvds_layout-2.ddl +++ b/tools/testfiles/vds/tvds_layout-2.ddl @@ -105,16 +105,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40, (0,1,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40, diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/testfiles/vds/tvds_layout-3_1.ddl index 968327d..e75fe36 100644 --- a/tools/testfiles/vds/tvds_layout-3_1.ddl +++ b/tools/testfiles/vds/tvds_layout-3_1.ddl @@ -125,16 +125,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9, (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10, diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/testfiles/vds/tvds_layout-3_2.ddl index 7e14ec2..5b63269 100644 --- a/tools/testfiles/vds/tvds_layout-3_2.ddl +++ b/tools/testfiles/vds/tvds_layout-3_2.ddl @@ -105,16 +105,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, (0,0,15): -9, -9, -9, -9, diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/testfiles/vds/tvds_layout-4.ddl index 018644e..a449d0c 100644 --- a/tools/testfiles/vds/tvds_layout-4.ddl +++ b/tools/testfiles/vds/tvds_layout-4.ddl @@ -25,16 +25,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): 10, 10, 10, 10, (0,1,0): 10, 10, 10, 10, diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/testfiles/vds/tvds_layout-5.ddl index b43629a..1698eb4 100644 --- a/tools/testfiles/vds/tvds_layout-5.ddl +++ b/tools/testfiles/vds/tvds_layout-5.ddl @@ -65,16 +65,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE -9 } - ALLOCATION_TIME { - H5D_ALLOC_TIME_INCR - } DATA { (0,0,0): 10, 10, 10, 10, (0,1,0): 10, 10, 10, 10, diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/testfiles/vds/vds_layout-eiger.ddl index 4a43606..d32a139 100644 --- a/tools/testfiles/vds/vds_layout-eiger.ddl +++ b/tools/testfiles/vds/vds_layout-eiger.ddl @@ -20,16 +20,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE H5D_FILL_VALUE_DEFAULT } - ALLOCATION_TIME { - H5D_ALLOC_TIME_LATE - } DATA { (0,0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (0,1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/testfiles/vds/vds_layout-maxmin.ddl index 9e0dee5..790fc1c 100644 --- a/tools/testfiles/vds/vds_layout-maxmin.ddl +++ b/tools/testfiles/vds/vds_layout-maxmin.ddl @@ -85,16 +85,10 @@ GROUP "/" { } } } - FILTERS { - NONE - } FILLVALUE { FILL_TIME H5D_FILL_TIME_IFSET VALUE H5D_FILL_VALUE_DEFAULT } - ALLOCATION_TIME { - H5D_ALLOC_TIME_LATE - } DATA { (0,0,0): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, (0,1,0): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |