summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-01-27 14:26:21 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-01-27 14:26:21 (GMT)
commit2f86aa75516bf4be8b8d250d4776bb89e1c5bfab (patch)
tree21fc364ef74e3f25e4c6cfdabf85ffde69a194c4
parent8235d9820a644e39c8392a9048c159846ea0919e (diff)
downloadhdf5-2f86aa75516bf4be8b8d250d4776bb89e1c5bfab.zip
hdf5-2f86aa75516bf4be8b8d250d4776bb89e1c5bfab.tar.gz
hdf5-2f86aa75516bf4be8b8d250d4776bb89e1c5bfab.tar.bz2
[svn-r24646] HDFFV-8640: Remove xlate_utility by fixing reference files to not add extra lines.
Tested: cmake and autotools local linux
-rw-r--r--CMakeLists.txt8
-rw-r--r--MANIFEST1
-rw-r--r--config/cmake/xlatefile.c56
-rw-r--r--test/CMakeTests.cmake4
-rw-r--r--test/testerror.sh.in4
-rw-r--r--test/testfiles/err_compat_13
-rw-r--r--test/testfiles/err_compat_23
-rw-r--r--test/testfiles/error_test_13
-rw-r--r--test/testfiles/error_test_23
-rw-r--r--test/testfiles/links_env.out3
-rw-r--r--tools/h5stat/CMakeTests.cmake4
-rw-r--r--tools/h5stat/testfiles/h5stat_dims1.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_dims2.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_err1_dims.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_err1_links.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_err1_numattrs.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_err2_numattrs.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-F.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-UD.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-UT.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-d.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-dT.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-file.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters-g.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_filters.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_help1.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_help2.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_links1.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_links2.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_links3.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_links4.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_links5.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_newgrat-UA.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_newgrat-UG.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_newgrat.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_nofile.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_notexist.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_numattrs1.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_numattrs2.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_numattrs3.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_numattrs4.ddl3
-rw-r--r--tools/h5stat/testfiles/h5stat_tsohm.ddl3
-rw-r--r--tools/h5stat/testh5stat.sh.in3
43 files changed, 4 insertions, 184 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd84c71..d443d78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -760,14 +760,6 @@ IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
#-----------------------------------------------------------------------------
-# Build utility to copy and strip X lines of file
-#-----------------------------------------------------------------------------
-IF (HDF5_BUILD_TOOLS AND BUILD_TESTING)
- SET (XLATE_UTILITY "xlatefile")
- ADD_EXECUTABLE(${XLATE_UTILITY} ${HDF5_RESOURCES_DIR}/xlatefile.c)
-ENDIF (HDF5_BUILD_TOOLS AND BUILD_TESTING)
-
-#-----------------------------------------------------------------------------
# Dashboard and Testing Settings
#-----------------------------------------------------------------------------
OPTION (BUILD_TESTING "Build HDF5 Unit Testing" OFF)
diff --git a/MANIFEST b/MANIFEST
index d149a03..05c9de0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2422,7 +2422,6 @@
./config/cmake/GetTimeOfDayTest.cpp
./config/cmake/HDF5CXXTests.cpp
./config/cmake/HDF5Tests.c
-./config/cmake/xlatefile.c
./config/cmake/CheckTypeSize.cmake
./config/cmake/H5cxx_config.h.in
./config/cmake/H5pubconf.h.in
diff --git a/config/cmake/xlatefile.c b/config/cmake/xlatefile.c
deleted file mode 100644
index e220289..0000000
--- a/config/cmake/xlatefile.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define BUFFERSIZE 1024
-
-int main(int argc, char *argv[]) {
- FILE *infile = NULL;
- FILE *outfile = NULL;
- char *buffer = NULL;
- char argbuf[8];
- size_t bytes = 0;
- size_t idx = 0;
- unsigned int lineidx = 0;
- unsigned int stripXlines = 3;
-
- if(argc < 3)
- exit(1);
- if(NULL == (infile = fopen(argv[1], "rb")))
- exit(2);
- if(NULL == (outfile = fopen(argv[2], "wb+")))
- exit(3);
- if(argc > 3)
- if(argv[3][0] == '-')
- if(argv[3][1] == 'l') {
- strcpy(argbuf, &argv[3][2]);
- stripXlines = atoi(argbuf);
- }
- buffer = (char*)malloc(BUFFERSIZE);
- if(buffer) {
- while(!feof(infile)) {
- /* read the file into the buffer. */
- bytes = fread(buffer, 1, BUFFERSIZE, infile);
- if(lineidx < stripXlines) {
- for(idx = 0; idx < bytes; idx++) {
- if(buffer[idx] == '\n') {
- lineidx++;
- if(buffer[idx+1] == '\r')
- idx++;
- }
- if(lineidx >= stripXlines) {
- fwrite(&buffer[idx+1], 1, bytes-idx-1, outfile);
- idx = bytes;
- }
- }
- }
- else
- fwrite(buffer, 1, bytes, outfile);
- }
- free(buffer);
- }
- fclose(outfile);
- fclose(infile);
-
- return 0;
-}
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 58ef1e6..f6960cd 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -40,8 +40,8 @@ FOREACH (ref_file ${HDF5_REFERENCE_FILES})
ADD_CUSTOM_COMMAND (
TARGET ${HDF5_TEST_LIB_TARGET}
POST_BUILD
- COMMAND ${XLATE_UTILITY}
- ARGS ${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file} ${dest} -l3
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${HDF5_TEST_SOURCE_DIR}/testfiles/${ref_file} ${dest}
)
ENDFOREACH (ref_file ${HDF5_REFERENCE_FILES})
diff --git a/test/testerror.sh.in b/test/testerror.sh.in
index eb01fb1..7c03414 100644
--- a/test/testerror.sh.in
+++ b/test/testerror.sh.in
@@ -61,10 +61,6 @@ TEST() {
# Run test.
TESTING $TEST_ERR
(
- echo "#############################"
- echo "Expected output for $TEST_ERR"
- echo "#############################"
-
# Skip the plugin for testing missing filter.
$ENVCMD $RUNSERIAL $TEST_ERR_BIN
) >$actual 2>$actual_err
diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1
index 5f4fd47..3a85b86 100644
--- a/test/testfiles/err_compat_1
+++ b/test/testfiles/err_compat_1
@@ -1,6 +1,3 @@
-#############################
-Expected output for err_compat
-#############################
Testing error API H5Eset/get_auto Testing error API based on data I/O All error API tests passed.
This program tests the Error API compatible with HDF5 version (number). There're supposed to be some error messages
********* Print error stack in HDF5 default way *********
diff --git a/test/testfiles/err_compat_2 b/test/testfiles/err_compat_2
index be6c40d..75e8769 100644
--- a/test/testfiles/err_compat_2
+++ b/test/testfiles/err_compat_2
@@ -1,4 +1 @@
-#############################
-Expected output for err_compat
-#############################
Test skipped because backward compatbility with v1.6 is NOT configured in
diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
index ddc995e..0acd288 100644
--- a/test/testfiles/error_test_1
+++ b/test/testfiles/error_test_1
@@ -1,6 +1,3 @@
-#############################
-Expected output for error_test
-#############################
This program tests the Error API. There're supposed to be some error messages
********* Print error stack in HDF5 default way *********
Second Test-DIAG: Error detected in Second Program (1.0) thread (IDs):
diff --git a/test/testfiles/error_test_2 b/test/testfiles/error_test_2
index f9d7317..6852f6f 100644
--- a/test/testfiles/error_test_2
+++ b/test/testfiles/error_test_2
@@ -1,4 +1 @@
-#############################
-Expected output for error_test
-#############################
Test skipped because backward compatbility with v1.6 is configured in
diff --git a/test/testfiles/links_env.out b/test/testfiles/links_env.out
index 3ca9b99..3f10fc6 100644
--- a/test/testfiles/links_env.out
+++ b/test/testfiles/links_env.out
@@ -1,6 +1,3 @@
-#############################
-Expected output for links_env
-#############################
Testing external links via environment variable PASSED
Testing external links via environment variable (w/new group format) PASSED
All external Link (HDF5_EXT_PREFIX) tests passed.
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