[svn-r25242] Bring revisions #24505 - #24670 from trunk to revise_chunks.

Tested on jam, ostrich, koala, platypus.

9 files changed, 10 insertions, 22 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f41a5a1..254797d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -178,6 +178,7 @@ SET (H5_TESTS
     bittests
     dt_arith
     dtypes
+    dsets
     cmpd_dset
     filter_fail
     extend
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 58ef1e6..1b80e67 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})
 
@@ -429,6 +429,7 @@ IF (HDF5_TEST_VFD)
       bittests
       dt_arith
       dtypes
+      dsets
       cmpd_dset
       filter_fail
       extend
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/test/testhdf5.c b/test/testhdf5.c
index f14c2c3..eade815 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -86,6 +86,11 @@ main(int argc, char *argv[])
     if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
         TestCleanup();
 
-    return (GetTestNumErrs());
+    /* Exit failure if errors encountered; else exit success. */
+    /* No need to print anything since PerformTests() already does. */
+    if (GetTestNumErrs() > 0)
+	exit(EXIT_FAILURE);
+    else
+	exit(EXIT_SUCCESS);
 }   /* end main() */