summaryrefslogtreecommitdiffstats
path: root/release_docs
diff options
context:
space:
mode:
Diffstat (limited to 'release_docs')
-rw-r--r--release_docs/INSTALL_CMake.txt4
-rw-r--r--release_docs/RELEASE.txt8
2 files changed, 8 insertions, 4 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 4bba5e8..51816c6 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -651,7 +651,11 @@ HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries"
HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF
HDF_TEST_EXPRESS "Control testing framework (0-3)" "0"
HDF5_TEST_VFD "Execute tests with different VFDs" OFF
+<<<<<<< Upstream, based on branch 'develop' of https://byrn@bitbucket.hdfgroup.org/scm/~byrn/hdf5_adb.git
HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF
+=======
+HDF5_TEST_VOL "Execute tests with different VOL connectors" OFF
+>>>>>>> e60534e HDFFV-10741 - remove SKIP_ERRSTK_TESTS option
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
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 9929665..93453a0 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -48,13 +48,13 @@ New Features
Configuration:
-------------
- - Skip tools test that test the error stack
+ - Change 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.
+ different then the expected. These tests now use grepTest.cmake, this was
+ changed to allow the error file to be searched for an expected string.
- (ADB - 2019/03/26, HDFFV-10741)
+ (ADB - 2019/04/15, HDFFV-10741)
- Keep stderr and stdout separate in tests