HDFFV-10741 - add option to skip tool error stack tests

2025-02-17 16:10:24 +08:00 · 2019-03-26 14:00:27 -05:00 · 2019-03-26 14:00:27 -05:00 · 6e2e461087
commit 6e2e461087
parent b530043b7a
12 changed files with 275 additions and 169 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -806,6 +806,7 @@ endif ()
 if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
  option (HDF5_BUILD_TOOLS  "Build HDF5 Tools" ON)
  if (HDF5_BUILD_TOOLS)
+    option (SKIP_ERROR_STACK_TESTS  "Skip HDF5 Tools Error Stack Tests" OFF)
    add_subdirectory (tools)
  endif ()
 endif ()
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@ -88,18 +88,26 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes

  macro (ADD_H5_ERR_TEST resultfile resultcode)
    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (
-          NAME H5WATCH_ARGS-h5watch-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5watch>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.mty"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5WATCH_ARGS-h5watch-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5WATCH_ARGS-h5watch-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5WATCH_ARGS-h5watch-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5watch>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.mty"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DEPENDS ${last_test})
      set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
    endif ()
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@ -652,6 +652,7 @@ HDF5_STRICT_FORMAT_CHECKS      "Whether to perform strict file format checks"
 HDF_TEST_EXPRESS               "Control testing framework (0-3)"                              "0"
 HDF5_TEST_VFD                  "Execute tests with different VFDs"                            OFF
 HDF5_TEST_VOL                  "Execute tests with different VOL connectors"                  OFF
+SKIP_ERROR_STACK_TESTS         "Skip tests that check the error stack"                        OFF
 HDF5_USE_16_API_DEFAULT        "Use the HDF5 1.6.x API by default"                            OFF
 HDF5_USE_18_API_DEFAULT        "Use the HDF5 1.8.x API by default"                            OFF
 HDF5_USE_110_API_DEFAULT       "Use the HDF5 1.10.x API by default"                           OFF
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@ -48,6 +48,14 @@ New Features

    Configuration:
    -------------
+    - Skip tools test that test the error stack
+
+      There are some use cases which can cause the error stack of tools to be
+      different then the expected. An option, SKIP_ERROR_STACK_TESTS, was added
+      that will skip over tests that test the error stack.
+
+      (ADB - 2019/03/26, HDFFV-10741)
+
    - Keep stderr and stdout separate in tests

      Changed test handling of output capture. Tests now keep the stderr
@ -149,8 +157,8 @@ New Features
    - Changed the default behavior in parallel when reading the same dataset in its entirely
      (i.e. H5S_ALL dataset selection) which is being read by all the processes collectively.
      The dataset mush be contiguous, less than 2GB, and of an atomic datatype.
-      The new behavior is the HDF5 library will use an MPI_Bcast to pass the data read from 
-      the disk by the root process to the remain processes in the MPI communicator associated 
+      The new behavior is the HDF5 library will use an MPI_Bcast to pass the data read from
+      the disk by the root process to the remain processes in the MPI communicator associated
      with the HDF5 file.

      (MSB - 2019/01/02, HDFFV-10652)
@ -165,10 +173,10 @@ New Features

    - Added new Fortran API, H5gmtime, which converts (C) 'time_t' structure
      to Fortran DATE AND TIME storage format.
-      
+
      (MSB, 2019/01/08, HDFFV-10443)

-    - Added new Fortran 'fields' optional parameter to: h5ovisit_f, h5oget_info_by_name_f, 
+    - Added new Fortran 'fields' optional parameter to: h5ovisit_f, h5oget_info_by_name_f,
      h5oget_info, h5oget_info_by_idx and h5ovisit_by_name_f.

      (MSB, 2019/01/08, HDFFV-10443)
@ -247,12 +255,12 @@ Bug Fixes since HDF5-1.10.3 release
    - Fixed memory leak in scale offset filter

      In a special case where the MinBits is the same as the number of bits in
-      the datatype's precision, the filter's data buffer was not freed, causing 
+      the datatype's precision, the filter's data buffer was not freed, causing
      the memory usage to grow. In general the buffer was freed correctly.  The
-      Minbits are the minimal number of bits to store the data values.  Please 
+      Minbits are the minimal number of bits to store the data values.  Please
      see the reference manual for H5Pset_scaleoffset for the detail.

-      (RL - 2019/3/4, HDFFV-10705) 
+      (RL - 2019/3/4, HDFFV-10705)

    - Fix hangs with collective metadata reads during chunked dataset I/O

@ -293,8 +301,8 @@ Bug Fixes since HDF5-1.10.3 release

      When deleting the attribute nodes from the name index v2 B-tree,
      if an attribute is found in the intermediate B-tree nodes,
-      which may be merged/redistributed in the process, we need to 
-      free the dynamically allocated spaces for the intermediate 
+      which may be merged/redistributed in the process, we need to
+      free the dynamically allocated spaces for the intermediate
      decoded attribute.

      (VC - 2018/12/26, HDFFV-10659)
@ -371,10 +379,10 @@ Bug Fixes since HDF5-1.10.3 release
    Fortran
    --------
    - Added symbolic links libhdf5_hl_fortran.so to libhdf5hl_fortran.so and
-      libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for 
-      autotools installs.  These were added to match the name of the files 
-      installed by cmake and the general pattern of hl lib files.  We will 
-      change the names of the installed lib files to the matching name in 
+      libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for
+      autotools installs.  These were added to match the name of the files
+      installed by cmake and the general pattern of hl lib files.  We will
+      change the names of the installed lib files to the matching name in
      the next major release.

      (LRK - 2019/01/04, HDFFV-10596)
@ -385,7 +393,7 @@ Bug Fixes since HDF5-1.10.3 release

      (MSB, 2018/12/04, HDFFV-10511)

-    - Fixed issue with Fortran not returning h5o_info_t field values 
+    - Fixed issue with Fortran not returning h5o_info_t field values
      meta_size%attr%index_size and  meta_size%attr%heap_size.

      (MSB, 2018/1/8, HDFFV-10443)
@ -668,10 +676,10 @@ Bug Fixes since HDF5-1.10.2 release
      conversions from or to long double types, especially when special values
      such as infinity or NAN were involved.  In some cases the results differed
      by extremely small amounts from those on other machines, while some other
-      tests resulted in segmentation faults.  These conversion tests with long 
-      double types have been disabled for ppc64 machines until the problems are 
+      tests resulted in segmentation faults.  These conversion tests with long
+      double types have been disabled for ppc64 machines until the problems are
      better understood and can be properly addressed.
-    
+
      (SRL - 2019/01/07, TRILAB-98)

 Supported Platforms
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@ -242,19 +242,27 @@
              ./testfiles/${testname}.out.out
              ./testfiles/${testname}.out.out.err
      )
-      add_test (
-          NAME H5COPY-CMP-${testname}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5copy>"
-              -D "TEST_ARGS=-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${vparam};${sparam};${srcname};${dparam};${dstname}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=./testfiles/${testname}.out.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=./testfiles/${testname}.out"
-              -D "TEST_ERRREF=./testfiles/${testname}.err"
-              -D "TEST_MASK=true"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5COPY-CMP-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5COPY-CMP-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5COPY-CMP-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5copy>"
+                -D "TEST_ARGS=-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${vparam};${sparam};${srcname};${dparam};${dstname}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=./testfiles/${testname}.out.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=./testfiles/${testname}.out"
+                -D "TEST_ERRREF=./testfiles/${testname}.err"
+                -D "TEST_MASK=true"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5COPY-CMP-${testname} PROPERTIES DEPENDS H5COPY-CMP-${testname}-clear-objects)
    endif ()
  endmacro ()
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@ -679,19 +679,27 @@
              ${resultfile}.out.err
      )
      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      add_test (
-          NAME H5DUMP-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.ddl"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -D "TEST_MASK_ERROR=true"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5DUMP-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5DUMP-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5DUMP-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.ddl"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -D "TEST_MASK_ERROR=true"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
    endif ()
  endmacro ()
@ -707,21 +715,29 @@
              ${resultfile}.out.err
      )
      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      add_test (
-          NAME H5DUMP-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.ddl"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -D "TEST_MASK_ERROR=true"
-              -D "TEST_ENV_VAR:STRING=${envvar}"
-              -D "TEST_ENV_VALUE:STRING=${envval}"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5DUMP-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5DUMP-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5DUMP-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/std"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.ddl"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_ENV_VAR:STRING=${envvar}"
+                -D "TEST_ENV_VALUE:STRING=${envval}"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
    endif ()
  endmacro ()
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@ -118,18 +118,26 @@
                  -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
          )
          set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
-          add_test (
-              NAME H5FC-${testname}-${testfile}
-              COMMAND "${CMAKE_COMMAND}"
-                  -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert>"
-                  -D "TEST_ARGS=${ARGN};outtmp.h5"
-                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-                  -D "TEST_OUTPUT=${testname}.out"
-                  -D "TEST_EXPECT=${resultcode}"
-                  -D "TEST_REFERENCE=${resultfile}"
-                  -D "TEST_ERRREF=${resultfile}.err"
-                  -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-          )
+          if (SKIP_ERROR_STACK_TESTS)
+            add_test (
+                NAME H5FC-${testname}-${testfile}
+               COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+            )
+            set_property(TEST H5FC-${testname}-${testfile} PROPERTY DISABLED)
+          else ()
+            add_test (
+                NAME H5FC-${testname}-${testfile}
+                COMMAND "${CMAKE_COMMAND}"
+                    -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert>"
+                    -D "TEST_ARGS=${ARGN};outtmp.h5"
+                    -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                    -D "TEST_OUTPUT=${testname}.out"
+                    -D "TEST_EXPECT=${resultcode}"
+                    -D "TEST_REFERENCE=${resultfile}"
+                    -D "TEST_ERRREF=${resultfile}.err"
+                    -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+            )
+          endif ()
          set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS "H5FC-${testname}-${testfile}-tmpfile")
          set (last_test "H5FC-${testname}-${testfile}")
      else ()
@ -206,19 +214,27 @@
              -E copy_if_different ${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${testfile} ./testfiles/outtmp.h5
      )
      set_tests_properties (H5FC-${testname}-${testfile}-tmpfile PROPERTIES DEPENDS "H5FC-${testname}-clear-objects")
-      add_test (
-          NAME H5FC-${testname}-${testfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert>"
-              -D "TEST_ARGS=${ARGN};outtmp.h5"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${testname}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -D "TEST_MASK_ERROR=true"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5FC-${testname}-${testfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5FC-${testname}-${testfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5FC-${testname}-${testfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5format_convert>"
+                -D "TEST_ARGS=${ARGN};outtmp.h5"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -D "TEST_MASK_ERROR=true"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5FC-${testname}-${testfile} PROPERTIES DEPENDS "H5FC-${testname}-${testfile}-tmpfile")
      set (last_test "H5FC-${testname}-${testfile}")
    endif ()
--- a/tools/test/h5jam/CMakeTests.cmake
+++ b/tools/test/h5jam/CMakeTests.cmake
@ -66,19 +66,27 @@
              ${expectfile}.out
              ${expectfile}.out.err
      )
-      add_test (
-          NAME H5JAM-${expectfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5jam>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=${expectfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_ERRREF=testfiles/${expectfile}.txt"
-              -D "TEST_SKIP_COMPARE=1"
-              -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5JAM-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5JAM-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5JAM-${expectfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5jam>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=${expectfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_ERRREF=testfiles/${expectfile}.txt"
+                -D "TEST_SKIP_COMPARE=1"
+                -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS "H5JAM-${expectfile}-clear-objects")
    endif ()
  endmacro ()
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@ -189,18 +189,26 @@
              testfiles/${resultfile}.out
              testfiles/${resultfile}.out.err
      )
-      add_test (
-          NAME H5LS-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
-              -D "TEST_ARGS=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.ls"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME HH5LS-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5LS-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5LS-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
+                -D "TEST_ARGS=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.ls"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
    endif ()
  endmacro ()
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@ -335,19 +335,27 @@
        if (last_test)
          set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
        endif ()
-        add_test (
-            NAME H5REPACK_MASK-${testname}
-            COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
-                -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
-                -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_MASK_ERROR=true"
-                -D "TEST_REFERENCE=${resultfile}.mty"
-                -D "TEST_ERRREF=${resultfile}-${testname}.tst"
-                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-        )
+        if (SKIP_ERROR_STACK_TESTS)
+          add_test (
+              NAME H5REPACK_MASK-${testname}
+              COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+          )
+          set_property(TEST H5REPACK_MASK-${testname} PROPERTY DISABLED)
+        else ()
+          add_test (
+              NAME H5REPACK_MASK-${testname}
+              COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                  -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
+                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                  -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                  -D "TEST_EXPECT=${resultcode}"
+                  -D "TEST_MASK_ERROR=true"
+                  -D "TEST_REFERENCE=${resultfile}.mty"
+                  -D "TEST_ERRREF=${resultfile}-${testname}.tst"
+                  -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+          )
+        endif ()
        set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS H5REPACK_MASK-${testname}-clear-objects)
      endif ()
    endif ()
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@ -150,18 +150,26 @@
      if (last_test)
        set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
      endif ()
-      add_test (
-          NAME H5STAT-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
-              -D "TEST_ARGS=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.mty"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5STAT-${resultfile}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5STAT-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5STAT-${resultfile}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
+                -D "TEST_ARGS=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=${resultfile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.mty"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
    endif ()
  endmacro ()
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@ -125,18 +125,26 @@
      if (last_test)
        set_tests_properties (H5CLEAR_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
      endif ()
-      add_test (
-          NAME H5CLEAR_CMP-${testname}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5clear>"
-              -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${testname}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.mty"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5CLEAR_CMP-${testname}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5WATCH_ARGS-h5watch-${resultfile} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5CLEAR_CMP-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5clear>"
+                -D "TEST_ARGS:STRING=${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.mty"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
      set (last_test "H5CLEAR_CMP-${testname}")
    endif ()
@ -198,18 +206,26 @@
              "${PROJECT_SOURCE_DIR}/testfiles/${testfile}" "${PROJECT_BINARY_DIR}/testfiles/${testfile}"
      )
      set_tests_properties (H5CLEAR_CMP-copy_${testname} PROPERTIES DEPENDS H5CLEAR_CMP-${testname}-clear-objects)
-      add_test (
-          NAME H5CLEAR_CMP-${testname}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5clear>"
-              -D "TEST_ARGS:STRING=${ARGN};${testfile}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
-              -D "TEST_OUTPUT=${testname}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.mty"
-              -D "TEST_ERRREF=${resultfile}.err"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
+      if (SKIP_ERROR_STACK_TESTS)
+        add_test (
+            NAME H5CLEAR_CMP-${testname}
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP Error Stack Test"
+        )
+        set_property(TEST H5CLEAR_CMP-${testname} PROPERTY DISABLED)
+      else ()
+        add_test (
+            NAME H5CLEAR_CMP-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5clear>"
+                -D "TEST_ARGS:STRING=${ARGN};${testfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}.mty"
+                -D "TEST_ERRREF=${resultfile}.err"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
      set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS H5CLEAR_CMP-copy_${testname})
      set (last_test "H5CLEAR_CMP-${testname}")
    endif ()