[svn-r24072] Merge trunk cmake changes to 1.8 branch.

Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.

Tested: local linux

10 files changed, 44 insertions, 8 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 2a59a32..444dd97 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tboot2A.ddl b/tools/testfiles/tboot2A.ddl
new file mode 100644
index 0000000..4b77b44
--- /dev/null
+++ b/tools/testfiles/tboot2A.ddl
@@ -0,0 +1,18 @@
+HDF5 "tfcontents2.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+}
+}
diff --git a/tools/testfiles/tboot2B.ddl b/tools/testfiles/tboot2B.ddl
new file mode 100644
index 0000000..4b77b44
--- /dev/null
+++ b/tools/testfiles/tboot2B.ddl
@@ -0,0 +1,18 @@
+HDF5 "tfcontents2.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+}
+}
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index 1ad1249..64a2880 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 1468ad1..cdb1f91 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index 557f2a7..6d2492a 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 342e4e8..4f56619 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index eb569d2..3432433 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index a00b561..e51a09e 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index aa6e79b..ba6e46d 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -59,7 +59,7 @@ usage: h5dump [OPTIONS] files
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
+ option. Subsetting is done by selecting a hyperslab from the data.
  Thus, the options mirror those for performing a hyperslab selection.
  One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
  The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in