Changes to region reference in h5dump no longer have errstack

5 files changed, 6 insertions, 79 deletions

diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 3120844..f7f2065 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -878,7 +878,7 @@
   # test for files with array data
   ADD_H5_TEST (tarray1 0 --enable-error-stack tarray1.h5)
   # # added for bug# 2092 - tarray1_big.h5
-  ADD_H5ERR_MASK_TEST (tarray1_big 0 "Undefined reference pointer" --enable-error-stack -R tarray1_big.h5)
+  ADD_H5_TEST (tarray1_big 0 --enable-error-stack -R tarray1_big.h5)
   ADD_H5_TEST (tarray2 0 --enable-error-stack tarray2.h5)
   ADD_H5_TEST (tarray3 0 --enable-error-stack tarray3.h5)
   ADD_H5_TEST (tarray4 0 --enable-error-stack tarray4.h5)
@@ -1089,9 +1089,9 @@
 
   # test for dataset region references
   ADD_H5_TEST (tdatareg 0 --enable-error-stack tdatareg.h5)
-  ADD_H5ERR_MASK_TEST (tdataregR 0 "Undefined reference pointer" --enable-error-stack -R tdatareg.h5)
+  ADD_H5_TEST (tdataregR 0 --enable-error-stack -R tdatareg.h5)
   ADD_H5_TEST (tattrreg 0 --enable-error-stack tattrreg.h5)
-  ADD_H5ERR_MASK_TEST (tattrregR 0 "Undefined reference pointer" -R --enable-error-stack tattrreg.h5)
+  ADD_H5_TEST (tattrregR 0 -R --enable-error-stack tattrreg.h5)
   ADD_H5_EXPORT_TEST (tbinregR tdatareg.h5 0 --enable-error-stack -d /Dataset1 -s 0 -R -y -o)
 
   # tests for group creation order
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
deleted file mode 100644
index be77711..0000000
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ /dev/null
@@ -1,31 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
-  #002: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
deleted file mode 100644
index be59f85..0000000
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ /dev/null
@@ -1,21 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
-  #001: (file name) line (number) in h5tools_dump_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
deleted file mode 100644
index d84d5ec..0000000
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ /dev/null
@@ -1,21 +0,0 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
-    major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
-    major: Failure in tools library
-    minor: error in function
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 566a4fd..30bf34d 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -1175,7 +1175,7 @@ TOOLTEST tvlenstr_array.ddl --enable-error-stack tvlenstr_array.h5
 # test for files with array data
 TOOLTEST tarray1.ddl --enable-error-stack tarray1.h5
 # # added for bug# 2092 - tarray1_big.h
-GREPTEST ERRTXT "Undefined reference pointer" tarray1_big.ddl --enable-error-stack -R tarray1_big.h5
+TOOLTEST tarray1_big.ddl --enable-error-stack -R tarray1_big.h5
 TOOLTEST tarray2.ddl --enable-error-stack tarray2.h5
 TOOLTEST tarray3.ddl --enable-error-stack tarray3.h5
 TOOLTEST tarray4.ddl --enable-error-stack tarray4.h5
@@ -1383,9 +1383,9 @@ fi
 
 # test for dataset region references
 TOOLTEST  tdatareg.ddl --enable-error-stack tdatareg.h5
-GREPTEST ERRTXT "Undefined reference pointer" tdataregR.ddl --enable-error-stack -R tdatareg.h5
+TOOLTEST  tdataregR.ddl --enable-error-stack -R tdatareg.h5
 TOOLTEST  tattrreg.ddl --enable-error-stack tattrreg.h5
-GREPTEST ERRTXT "Undefined reference pointer" tattrregR.ddl --enable-error-stack -R tattrreg.h5
+TOOLTEST  tattrregR.ddl --enable-error-stack -R tattrreg.h5
 TOOLTEST2 tbinregR.exp --enable-error-stack -d /Dataset1 -s 0 -R -y -o tbinregR.txt    tdatareg.h5
 
 # Clean up text output files