[svn-r24646] HDFFV-8640: Remove xlate_utility by fixing reference files to not add extra lines.

Tested: cmake and autotools local linux

33 files changed, 2 insertions, 98 deletions

diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake
index 0e4315f..81ddf82 100644
--- a/tools/h5stat/CMakeTests.cmake
+++ b/tools/h5stat/CMakeTests.cmake
@@ -54,8 +54,8 @@
     ADD_CUSTOM_COMMAND (
         TARGET     h5stat
         POST_BUILD
-        COMMAND    ${XLATE_UTILITY}
-        ARGS       ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${ddl_file} ${ddldest} -l3
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${ddl_file} ${ddldest}
     )
   ENDFOREACH (ddl_file ${HDF5_REFERENCE_FILES})
 
diff --git a/tools/h5stat/testfiles/h5stat_dims1.ddl b/tools/h5stat/testfiles/h5stat_dims1.ddl
index 182d31a..c285ea4 100644
--- a/tools/h5stat/testfiles/h5stat_dims1.ddl
+++ b/tools/h5stat/testfiles/h5stat_dims1.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -gd -m 5 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Small groups (with 0 to 9 links):
 	# of groups with 0 link(s): 1
diff --git a/tools/h5stat/testfiles/h5stat_dims2.ddl b/tools/h5stat/testfiles/h5stat_dims2.ddl
index abf3f61..769749e 100644
--- a/tools/h5stat/testfiles/h5stat_dims2.ddl
+++ b/tools/h5stat/testfiles/h5stat_dims2.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -d --di=15 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Dataset dimension information:
 	Max. rank of datasets: 2
diff --git a/tools/h5stat/testfiles/h5stat_err1_dims.ddl b/tools/h5stat/testfiles/h5stat_err1_dims.ddl
index 8f0686f..86d375b 100644
--- a/tools/h5stat/testfiles/h5stat_err1_dims.ddl
+++ b/tools/h5stat/testfiles/h5stat_err1_dims.ddl
@@ -1,4 +1 @@
-#############################
-Expected output for 'h5stat -d --dims=-1 h5stat_threshold.h5'
-#############################
 h5stat error: Invalid threshold for small datasets
diff --git a/tools/h5stat/testfiles/h5stat_err1_links.ddl b/tools/h5stat/testfiles/h5stat_err1_links.ddl
index 07987a2..d43207c 100644
--- a/tools/h5stat/testfiles/h5stat_err1_links.ddl
+++ b/tools/h5stat/testfiles/h5stat_err1_links.ddl
@@ -1,4 +1 @@
-#############################
-Expected output for 'h5stat -l 0 h5stat_threshold.h5'
-#############################
 h5stat error: Invalid threshold for small groups
diff --git a/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
index 8eea546..01b6c18 100644
--- a/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
+++ b/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
@@ -1,4 +1 @@
-#############################
-Expected output for 'h5stat -a -2 h5stat_threshold.h5'
-#############################
 h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
index a1ecb31..01b6c18 100644
--- a/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
+++ b/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
@@ -1,4 +1 @@
-#############################
-Expected output for 'h5stat --numattrs h5stat_threshold.h5'
-#############################
 h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl
index fba875a..d44445b 100644
--- a/tools/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-F.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -F h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 File space information for file metadata (in bytes):
 	Superblock: 96
diff --git a/tools/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/h5stat/testfiles/h5stat_filters-UD.ddl
index decfb81..4efafd1 100644
--- a/tools/h5stat/testfiles/h5stat_filters-UD.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-UD.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -D h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 File space information for datasets' metadata (in bytes):
 	Object headers (total/unused): 4136/1344
diff --git a/tools/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/h5stat/testfiles/h5stat_filters-UT.ddl
index 189eaa6..d8de31f 100644
--- a/tools/h5stat/testfiles/h5stat_filters-UT.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-UT.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -T h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 Dataset datatype information:
 	# of unique datatypes used by datasets: 2
diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl
index dae1f06..2e0bd64 100644
--- a/tools/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-d.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -d h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 Dataset dimension information:
 	Max. rank of datasets: 2
diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
index 5c7a4ab..9ef3e82 100644
--- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -dT h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 Dataset dimension information:
 	Max. rank of datasets: 2
diff --git a/tools/h5stat/testfiles/h5stat_filters-file.ddl b/tools/h5stat/testfiles/h5stat_filters-file.ddl
index eddc898..5f7eff9 100644
--- a/tools/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-file.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -f h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters-g.ddl b/tools/h5stat/testfiles/h5stat_filters-g.ddl
index 6cb791c..290c82a 100644
--- a/tools/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-g.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -g h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 Small groups (with 0 to 9 links):
 	Total # of small groups: 0
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index 0a6733d..24522cd 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat h5stat_filters.h5'
-#############################
 Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index d79c99f..d2a8715 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -h'
-#############################
 Usage: h5stat [OPTIONS] file
 
       OPTIONS
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index af48e3a..d2a8715 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat --help'
-#############################
 Usage: h5stat [OPTIONS] file
 
       OPTIONS
diff --git a/tools/h5stat/testfiles/h5stat_links1.ddl b/tools/h5stat/testfiles/h5stat_links1.ddl
index e77a788..c650f15 100644
--- a/tools/h5stat/testfiles/h5stat_links1.ddl
+++ b/tools/h5stat/testfiles/h5stat_links1.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -g -l 8 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Small groups (with 0 to 7 links):
 	# of groups with 0 link(s): 1
diff --git a/tools/h5stat/testfiles/h5stat_links2.ddl b/tools/h5stat/testfiles/h5stat_links2.ddl
index 5207343..09bf937 100644
--- a/tools/h5stat/testfiles/h5stat_links2.ddl
+++ b/tools/h5stat/testfiles/h5stat_links2.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat --links=8 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 File information
 	# of unique groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_links3.ddl b/tools/h5stat/testfiles/h5stat_links3.ddl
index d0071d7..f80471a 100644
--- a/tools/h5stat/testfiles/h5stat_links3.ddl
+++ b/tools/h5stat/testfiles/h5stat_links3.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat --links=20 -g h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Small groups (with 0 to 19 links):
 	# of groups with 0 link(s): 1
diff --git a/tools/h5stat/testfiles/h5stat_links4.ddl b/tools/h5stat/testfiles/h5stat_links4.ddl
index ca3911c..94feffd 100644
--- a/tools/h5stat/testfiles/h5stat_links4.ddl
+++ b/tools/h5stat/testfiles/h5stat_links4.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -g h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 Small groups (with 0 to 9 links):
 	# of groups with 0 link(s): 35000
diff --git a/tools/h5stat/testfiles/h5stat_links5.ddl b/tools/h5stat/testfiles/h5stat_links5.ddl
index 44ec161..6f33bed 100644
--- a/tools/h5stat/testfiles/h5stat_links5.ddl
+++ b/tools/h5stat/testfiles/h5stat_links5.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -g -l 40000 h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 Small groups (with 0 to 39999 links):
 	# of groups with 0 link(s): 35000
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
index 18f91f3..a5ee7e8 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -A h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 Small # of attributes (objects with 1 to 10 attributes):
 	Total # of objects with small # of attributes: 0
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
index ecebdef..41195ac 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -G h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 File space information for groups' metadata (in bytes):
 	Object headers (total/unused): 5145147/3220092
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index 7d4ef91..33d756b 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 File information
 	# of unique groups: 35001
diff --git a/tools/h5stat/testfiles/h5stat_nofile.ddl b/tools/h5stat/testfiles/h5stat_nofile.ddl
index cf20995..d8a8b2c 100644
--- a/tools/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/h5stat/testfiles/h5stat_nofile.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat '
-#############################
 Usage: h5stat [OPTIONS] file
 
       OPTIONS
diff --git a/tools/h5stat/testfiles/h5stat_notexist.ddl b/tools/h5stat/testfiles/h5stat_notexist.ddl
index ac0fce4..cc25e43 100644
--- a/tools/h5stat/testfiles/h5stat_notexist.ddl
+++ b/tools/h5stat/testfiles/h5stat_notexist.ddl
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5stat notexist.h5'
-#############################
 Filename: notexist.h5
 h5stat error: unable to open file "notexist.h5"
diff --git a/tools/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/h5stat/testfiles/h5stat_numattrs1.ddl
index 86cfcb0..fb5568d 100644
--- a/tools/h5stat/testfiles/h5stat_numattrs1.ddl
+++ b/tools/h5stat/testfiles/h5stat_numattrs1.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -AS -a 10 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Small # of attributes (objects with 1 to 10 attributes):
 	# of objects with 1 attributes: 2
diff --git a/tools/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/h5stat/testfiles/h5stat_numattrs2.ddl
index 5ee3adf..1313aec 100644
--- a/tools/h5stat/testfiles/h5stat_numattrs2.ddl
+++ b/tools/h5stat/testfiles/h5stat_numattrs2.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -a 1 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 File information
 	# of unique groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/h5stat/testfiles/h5stat_numattrs3.ddl
index 515b76c..de8d6a3 100644
--- a/tools/h5stat/testfiles/h5stat_numattrs3.ddl
+++ b/tools/h5stat/testfiles/h5stat_numattrs3.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -A --numattrs=25 h5stat_threshold.h5'
-#############################
 Filename: h5stat_threshold.h5
 Small # of attributes (objects with 1 to 25 attributes):
 	# of objects with 1 attributes: 2
diff --git a/tools/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/h5stat/testfiles/h5stat_numattrs4.ddl
index 515a4a9..2b0122a 100644
--- a/tools/h5stat/testfiles/h5stat_numattrs4.ddl
+++ b/tools/h5stat/testfiles/h5stat_numattrs4.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat -A -a 100 h5stat_newgrat.h5'
-#############################
 Filename: h5stat_newgrat.h5
 Small # of attributes (objects with 1 to 100 attributes):
 	# of objects with 100 attributes: 1
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index 788421b..37de79b 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5stat h5stat_tsohm.h5'
-#############################
 Filename: h5stat_tsohm.h5
 File information
 	# of unique groups: 1
diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in
index 865093a..cb0446b 100644
--- a/tools/h5stat/testh5stat.sh.in
+++ b/tools/h5stat/testh5stat.sh.in
@@ -191,9 +191,6 @@ TOOLTEST() {
    # Run test.
    TESTING $STAT $@
    (
-      echo "#############################"
-      echo "Expected output for '$STAT $@'" 
-      echo "#############################"
       cd $TESTDIR
       $RUNSERIAL $STAT_BIN $@
    ) >$actual 2>$actual_err