merge and fix conflicts

7 files changed, 124 insertions, 118 deletions

diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 6299821..2e731f3 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -198,6 +198,16 @@
       ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt
       ${HDF5_TOOLS_DIR}/testfiles/out3.h5import
       ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
+      #STD_REF_OBJ files
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl
   )
   set (HDF5_N_REFERENCE_FILES
       tall-3
@@ -322,6 +332,18 @@
       ${HDF5_TOOLS_DIR}/testfiles/tvms.h5
       ${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5
       ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5
+      #STD_REF_OBJ files
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
+      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
+
   )
   set (HDF5_ERROR_REFERENCE_TEST_FILES
       ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
@@ -892,7 +914,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_H5ERR_MASK_TEST (tarray1_big 0 "NULL token size" --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)
@@ -1103,11 +1125,22 @@
 
   # 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_H5ERR_MASK_TEST (tdataregR 0 "NULL token size" --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_H5ERR_MASK_TEST (tattrregR 0 "NULL token size" -R --enable-error-stack tattrreg.h5)
   ADD_H5_EXPORT_TEST (tbinregR tdatareg.h5 0 --enable-error-stack -d /Dataset1 -s 0 -R -y -o)
 
+  # test for 1.12 region references
+  ADD_H5_TEST (trefer_attrR 0 --enable-error-stack -R trefer_attr.h5)
+  ADD_H5_TEST (trefer_compatR 0 --enable-error-stack -R trefer_compat.h5)
+  ADD_H5_TEST (trefer_extR 0 --enable-error-stack -R trefer_ext2.h5)
+  ADD_H5_TEST (trefer_grpR 0 --enable-error-stack -R trefer_grp.h5)
+  ADD_H5_TEST (trefer_obj_delR 0 --enable-error-stack -R trefer_obj_del.h5)
+  ADD_H5_TEST (trefer_objR 0 --enable-error-stack -R trefer_obj.h5)
+  ADD_H5_TEST (trefer_paramR 0 --enable-error-stack -R trefer_param.h5)
+  ADD_H5_TEST (trefer_regR 0 --enable-error-stack -R trefer_reg.h5)
+  ADD_H5_TEST (trefer_reg_1dR 0 --enable-error-stack -R trefer_reg_1d.h5)
+
   # tests for group creation order
   # "1" tracked, "2" name, root tracked
   ADD_H5_TEST (tordergr1 0 --enable-error-stack --group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5)
diff --git a/tools/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c
index 571452e..661a6dc 100644
--- a/tools/test/h5dump/dynlib_dump.c
+++ b/tools/test/h5dump/dynlib_dump.c
@@ -69,7 +69,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = temp - MULTIPLIER;
+            *int_ptr = (int8_t)(temp - MULTIPLIER);
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -78,7 +78,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = temp + MULTIPLIER;
+            *int_ptr = (int8_t)(temp + MULTIPLIER);
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index ff22495..a20b0b7 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -1,58 +1,31 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #002: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #002: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 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
index 8a1539c..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -1,39 +1,21 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 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
index 8a1539c..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -1,39 +1,21 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 5d4c21b..310b1ed 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2565,7 +2565,7 @@ static void gent_bitfields(void)
         goto error;
 
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
+        buf[i] = (uint8_t)(0xff ^ i);
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
     if(H5Sclose(space) < 0) goto error;
@@ -2579,7 +2579,7 @@ static void gent_bitfields(void)
             (dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
+        buf[i] = (uint8_t)(0xff ^ i);
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
     if(H5Sclose(space) < 0) goto error;
@@ -9814,7 +9814,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf[i] = (uint8_t)0xff ^ (uint8_t)i;
+                        buf[i] = (uint8_t)(0xff ^ i);
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                     H5Dclose(dset);
@@ -9829,7 +9829,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
+                        buf2[i] = (uint16_t)(0xffff ^ (i * 16));
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                     H5Dclose(dset);
@@ -9879,7 +9879,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf[i] = (uint8_t)0xff ^ (uint8_t)i;
+                            H5_CHECKED_ASSIGN(buf[i], uint8_t, 0xff ^ i, size_t);
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                         H5Dclose(dset);
                     }
@@ -9895,7 +9895,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
+                            H5_CHECKED_ASSIGN(buf2[i], uint16_t, 0xffff ^ (i * 16), size_t);
 
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                         H5Dclose(dset);
@@ -9918,8 +9918,8 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "compound_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for(i = 0; i < nelmts; i++) {
-                        buf5[i].a = (uint8_t)0xff ^ (uint8_t)i;
-                        buf5[i].b = (uint16_t)0xffff ^ (uint16_t)(i * 16);
+                        H5_CHECKED_ASSIGN(buf5[i].a, uint8_t, 0xff ^ i, size_t);
+                        H5_CHECKED_ASSIGN(buf5[i].b, uint16_t, 0xffff ^ (i * 16), size_t);
                         buf5[i].c = (uint32_t)0xffffffff ^ (uint32_t)(i * 32);
                         buf5[i].d = (uint64_t)0xffffffffffffffff ^ (uint64_t)(i * 64);
                     }
@@ -10488,7 +10488,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = temp - MULTIPLIER;
+            *int_ptr = (int8_t)(temp - MULTIPLIER);
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -10497,7 +10497,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = temp + MULTIPLIER;
+            *int_ptr = (int8_t)(temp + MULTIPLIER);
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 141715c..53c8927 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -923,7 +923,43 @@ GREPTEST()
       cd $TESTDIR
       $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
-    if [[ "$txttype" = "ERRTXT" ]]; then
+    if [ "$txttype" = "ERRTXT" ]; then
+        $GREP "$expectdata" $actual_err > /dev/null
+    else
+        $GREP "$expectdata" $actual > /dev/null
+    fi
+    if [ $? -eq 0 ]; then
+        echo " PASSED"
+    else
+        echo " FAILED"
+        nerrors="`expr $nerrors + 1`"
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actual_err
+    fi
+}
+
+# Call the h5dump tool and grep for a value but disables plugin filter loading
+# txttype ERRTXT greps test error output, otherwise greps test output
+GREPTEST2()
+{
+    txttype=$1
+    expectdata=$2
+    actual=$TESTDIR/$3
+    actual_err="$TESTDIR/`basename $3 .ddl`.oerr"
+    shift
+    shift
+    shift
+
+    # Run test.
+    TESTING $DUMPER -p $@
+    (
+      cd $TESTDIR
+      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
+    ) >$actual 2>$actual_err
+    if [ "$txttype" = "ERRTXT" ]; then
         $GREP "$expectdata" $actual_err > /dev/null
     else
         $GREP "$expectdata" $actual > /dev/null
@@ -1143,7 +1179,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
+GREPTEST ERRTXT "NULL token size" 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
@@ -1351,9 +1387,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
+GREPTEST ERRTXT "NULL token size" 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
+GREPTEST ERRTXT "NULL token size" 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
@@ -1390,7 +1426,7 @@ TOOLTEST4 textlinkfar.ddl --enable-error-stack textlinkfar.h5
 TOOLTEST4 textlink.ddl --enable-error-stack textlink.h5
 
 # test for error stack display (BZ2048)
-TOOLTEST5 filter_fail.ddl --enable-error-stack filter_fail.h5
+GREPTEST2 ERRTXT "filter plugins disabled" filter_fail.ddl --enable-error-stack filter_fail.h5
 
 # test for -o -y for dataset with attributes
 TOOLTEST2 tall-6.exp --enable-error-stack -y -o tall-6.txt -d /g1/g1.1/dset1.1.1 tall.h5