summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-09-06 15:18:18 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-09-06 15:18:18 (GMT)
commite271abfb36e59198124cb0d37286ceeb67c90e10 (patch)
tree26e797a399f232c527ed6af3fa21c3f378ea998b
parent539c17b2f47b5b6d07cb8a502cc9be94a20a5de4 (diff)
downloadhdf5-e271abfb36e59198124cb0d37286ceeb67c90e10.zip
hdf5-e271abfb36e59198124cb0d37286ceeb67c90e10.tar.gz
hdf5-e271abfb36e59198124cb0d37286ceeb67c90e10.tar.bz2
HDFFV-10276 Add filter mask for standard err
-rw-r--r--tools/test/h5diff/CMakeTests.cmake3
-rw-r--r--tools/test/h5diff/testfiles/h5diff_454_ERR.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_455_ERR.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_457_ERR.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_458_ERR.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_459_ERR.txt4
-rw-r--r--tools/test/h5diff/testfiles/h5diff_601_ERR.txt4
7 files changed, 15 insertions, 12 deletions
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index a07d3c9..0f61539 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -412,6 +412,7 @@
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
+ -D "TEST_MASK_ERROR=true"
-D "TEST_APPEND=EXIT CODE:"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
@@ -521,6 +522,7 @@
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
+ -D "TEST_MASK_ERROR=true"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
-D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}"
@@ -536,6 +538,7 @@
-D "TEST_OUTPUT=${resultfile}_ERR.out"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_REFERENCE=${resultfile}_ERR.txt"
+ -D "TEST_MASK_ERROR=true"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
-D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
diff --git a/tools/test/h5diff/testfiles/h5diff_454_ERR.txt b/tools/test/h5diff/testfiles/h5diff_454_ERR.txt
index 61ae5ed..de25a69 100644
--- a/tools/test/h5diff/testfiles/h5diff_454_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_454_ERR.txt
@@ -1,6 +1,6 @@
Warning: </softlink_noexist> is a dangling link.
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/h5diff_455_ERR.txt b/tools/test/h5diff/testfiles/h5diff_455_ERR.txt
index dc1b6a1..de25a69 100644
--- a/tools/test/h5diff/testfiles/h5diff_455_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_455_ERR.txt
@@ -1,6 +1,6 @@
Warning: </softlink_noexist> is a dangling link.
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/h5diff_457_ERR.txt b/tools/test/h5diff/testfiles/h5diff_457_ERR.txt
index 927b301..6594c9a 100644
--- a/tools/test/h5diff/testfiles/h5diff_457_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_457_ERR.txt
@@ -1,6 +1,6 @@
Warning: </ext_link_noexist1> is a dangling link.
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/h5diff_458_ERR.txt b/tools/test/h5diff/testfiles/h5diff_458_ERR.txt
index d6cd1b9..9a09c17 100644
--- a/tools/test/h5diff/testfiles/h5diff_458_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_458_ERR.txt
@@ -1,6 +1,6 @@
Warning: </ext_link_noexist2> is a dangling link.
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 861 in h5diff(): Error: treat dangling link as error
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/h5diff_459_ERR.txt b/tools/test/h5diff/testfiles/h5diff_459_ERR.txt
index 0aacb1f..6594c9a 100644
--- a/tools/test/h5diff/testfiles/h5diff_459_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_459_ERR.txt
@@ -1,6 +1,6 @@
Warning: </ext_link_noexist1> is a dangling link.
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 818 in h5diff(): Error: treat dangling link as error
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: treat dangling link as error
major: Failure in tools library
minor: error in function
EXIT CODE: 2
diff --git a/tools/test/h5diff/testfiles/h5diff_601_ERR.txt b/tools/test/h5diff/testfiles/h5diff_601_ERR.txt
index d1a50f9..b58124a 100644
--- a/tools/test/h5diff/testfiles/h5diff_601_ERR.txt
+++ b/tools/test/h5diff/testfiles/h5diff_601_ERR.txt
@@ -1,6 +1,6 @@
Object </nono_obj> could not be found in <h5diff_basic1.h5>
-H5tools-DIAG: Error detected in HDF5:tools (1.11.0) thread 0:
- #000: /home/byrn/HDF_Projects/hdf5/dev/tools/lib/h5diff.c line 690 in h5diff(): Error: Object could not be found
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+ #000: (file name) line (number) in h5diff(): Error: Object could not be found
major: Failure in tools library
minor: error in function
EXIT CODE: 2