Switch tool error output to match VOL changes within library

1 files changed, 26 insertions, 20 deletions

diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index abeef52..aaf3144 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -2,67 +2,73 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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__native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
     major: File accessibility
     minor: Unable to open file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
     major: File accessibility
     minor: Unable to open file