[svn-r3249] Purpose:

    New Feature
Description:
    Changed the command line flags in the h5dumper so that they accept
    both short and long flags. The flag syntax for some have changed
    (I.e., object ids are no longer -v but -i and -header is now -H or
    --header, etc.) A new function is added called get_options which can
    be used for all other tools as well.

    Had to change these output files to accept the correct flags.
Platforms tested:
    Linux

8 files changed, 8 insertions, 8 deletions

diff --git a/tools/testfiles/tall-2.ddl b/tools/testfiles/tall-2.ddl
index 200c828..40e35f6 100644
--- a/tools/testfiles/tall-2.ddl
+++ b/tools/testfiles/tall-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -header -g /g1/g1.1 -a attr2 tall.h5'
+Expected output for 'h5dump --header -g /g1/g1.1 -a attr2 tall.h5'
 #############################
 HDF5 "tall.h5" {
 GROUP "/g1/g1.1" {
diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl
index fa8e97f..01d9fb9 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/testfiles/tattr-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -a attr1 attr4 attr5 tattr.h5'
+Expected output for 'h5dump -a attr1 --attribute attr4 --attribute=attr5 tattr.h5'
 #############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "attr1" {
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index c05ae64..41397f9 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -header -a attr2 attr tattr.h5'
+Expected output for 'h5dump --header -a attr2 --attribute=attr tattr.h5'
 #############################
 HDF5 "tattr.h5" {
 ATTRIBUTE "attr2" {
diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl
index ac978e5..0b6423f 100644
--- a/tools/testfiles/tcomp-2.ddl
+++ b/tools/testfiles/tcomp-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -t /type1 /type2 /group1/type3 tcompound.h5'
+Expected output for 'h5dump -t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5'
 #############################
 HDF5 "tcompound.h5" {
 DATATYPE "/type1" H5T_COMPOUND {
diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl
index e28fe68..8276e22 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/testfiles/tdset-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -header -d dset1 /dset2 dset3 tdset.h5'
+Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5'
 #############################
 HDF5 "tdset.h5" {
 DATASET "dset1" {
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/testfiles/tgroup-2.ddl
index 777a5d7..d57ebf1 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/testfiles/tgroup-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -g /g2 / /y tgroup.h5'
+Expected output for 'h5dump -g /g2 -g / -g /y tgroup.h5'
 #############################
 HDF5 "tgroup.h5" {
 GROUP "/g2" {
diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl
index a85484f..17b86b1 100644
--- a/tools/testfiles/thlink-2.ddl
+++ b/tools/testfiles/thlink-2.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -d /g1/dset2 /dset1 /g1/g1.1/dset3 thlink.h5'
+Expected output for 'h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/g1/dset2" {
diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl
index ad5d963..983a45f 100644
--- a/tools/testfiles/thlink-3.ddl
+++ b/tools/testfiles/thlink-3.ddl
@@ -1,5 +1,5 @@
 #############################
-Expected output for 'h5dump -d /g1/g1.1/dset3 /g1/dset2 /dset1 thlink.h5'
+Expected output for 'h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5'
 #############################
 HDF5 "thlink.h5" {
 DATASET "/g1/g1.1/dset3" {