Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

2 files changed, 83 insertions, 23 deletions

diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1
index fc99f77..e0c4654 100644
--- a/test/testfiles/err_compat_1
+++ b/test/testfiles/err_compat_1
@@ -1,8 +1,10 @@
-Testing error API H5Eset/get_auto                                     Testing error API based on data I/O                                   All error API tests passed.
+Testing error API H5Eset/get_auto                                     
+Testing error API based on data I/O                                   
+All error API tests passed.
    This program tests the Error API compatible with HDF5 version (number).  There are supposed to be some error messages
 ********* Print error stack in HDF5 default way *********
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in main(): Error test failed
+  #000: (file name) line (number) in main(): fake error message 1
     major: Error API
     minor: Bad value
 
@@ -10,38 +12,87 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     error #000: (file name) in main(): line (number)
         major: Error API
         minor: Bad value
-
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dcreate2(): invalid location identifier
+  #000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
+    major: Dataset
+    minor: Unable to create file
+  #001: (file name) line (number) in H5D__create_api_common(): can't set object access arguments
+    major: Dataset
+    minor: Can't set value
+  #002: (file name) line (number) in H5VL_setup_acc_args(): invalid location identifier
+    major: Invalid arguments to routine
+    minor: Inappropriate type
+  #003: (file name) line (number) in H5VL_vol_object(): invalid identifier type to function
     major: Invalid arguments to routine
     minor: Inappropriate type
 
 ********* Print error stack in customized way *********
-    error #000: (file name) in H5Dcreate2(): line (number)
+    error #000: (file name) in H5VL_vol_object(): line (number)
+        major: Invalid arguments to routine
+        minor: Inappropriate type
+    error #001: (file name) in H5VL_setup_acc_args(): line (number)
         major: Invalid arguments to routine
         minor: Inappropriate type
+    error #002: (file name) in H5D__create_api_common(): line (number)
+        major: Dataset
+        minor: Can't set value
+    error #003: (file name) in H5Dcreate2(): line (number)
+        major: Dataset
+        minor: Unable to create file
 
 ********* Print error stack in customized way *********
-    error #000: (file name) in H5Eget_auto(1 or 2)(): line (number)
+    error #000: (file name) in H5VL_vol_object(): line (number)
+        major: Invalid arguments to routine
+        minor: Inappropriate type
+    error #001: (file name) in H5VL_setup_acc_args(): line (number)
+        major: Invalid arguments to routine
+        minor: Inappropriate type
+    error #002: (file name) in H5D__create_api_common(): line (number)
+        major: Dataset
+        minor: Can't set value
+    error #003: (file name) in H5Dcreate2(): line (number)
+        major: Dataset
+        minor: Unable to create file
+    error #004: (file name) in H5Eget_auto(1 or 2)(): line (number)
         major: Error API
         minor: Can't get value
 
 ********* Print error stack in customized way *********
-    error #000: (file name) in H5Dcreate2(): line (number)
+    error #000: (file name) in H5VL_vol_object(): line (number)
+        major: Invalid arguments to routine
+        minor: Inappropriate type
+    error #001: (file name) in H5VL_setup_acc_args(): line (number)
         major: Invalid arguments to routine
         minor: Inappropriate type
+    error #002: (file name) in H5D__create_api_common(): line (number)
+        major: Dataset
+        minor: Can't set value
+    error #003: (file name) in H5Dcreate2(): line (number)
+        major: Dataset
+        minor: Unable to create file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dcreate2(): invalid location identifier
+  #000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
+    major: Dataset
+    minor: Unable to create file
+  #001: (file name) line (number) in H5D__create_api_common(): can't set object access arguments
+    major: Dataset
+    minor: Can't set value
+  #002: (file name) line (number) in H5VL_setup_acc_args(): invalid location identifier
+    major: Invalid arguments to routine
+    minor: Inappropriate type
+  #003: (file name) line (number) in H5VL_vol_object(): invalid identifier type to function
     major: Invalid arguments to routine
     minor: Inappropriate type
-
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in main(): Error test failed
+  #000: (file name) line (number) in main(): fake error message 2
     major: Error API
     minor: Unrecognized message
-  #001: (file name) line (number) in test_error2(): H5Dwrite shouldn't succeed
+  #001: (file name) line (number) in test_h5epush1(): expected H5Dwrite error
     major: Error API
     minor: Write failed
-  #002: (file name) line (number) in H5Dwrite(): dset_id is not a dataset ID
+  #002: (file name) line (number) in H5Dwrite(): can't synchronously write data
+    major: Dataset
+    minor: Write failed
+  #003: (file name) line (number) in H5D__write_api_common(): dset_id is not a dataset ID
     major: Invalid arguments to routine
     minor: Inappropriate type
diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
index f0e4a62..070869e 100644
--- a/test/testfiles/error_test_1
+++ b/test/testfiles/error_test_1
@@ -21,7 +21,10 @@ Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
 
 Testing error API based on data I/O
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dwrite(): dset_id is not a dataset ID
+  #000: (file name) line (number) in H5Dwrite(): can't synchronously write data
+    major: Dataset
+    minor: Write failed
+  #001: (file name) line (number) in H5D__write_api_common(): dset_id is not a dataset ID
     major: Invalid arguments to routine
     minor: Inappropriate type
 Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
@@ -32,37 +35,43 @@ Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
     major: Error in IO
     minor: Error in H5Dwrite
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #002: (file name) line (number) in H5Dwrite(): dset_id is not a dataset ID
+  #002: (file name) line (number) in H5Dwrite(): can't synchronously write data
+    major: Dataset
+    minor: Write failed
+  #003: (file name) line (number) in H5D__write_api_common(): dset_id is not a dataset ID
     major: Invalid arguments to routine
     minor: Inappropriate type
 
 Testing error message during data reading when filter isn't registered
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dread(): can't read data
+  #000: (file name) line (number) in H5Dread(): can't synchronously read data
+    major: Dataset
+    minor: Read failed
+  #001: (file name) line (number) in H5D__read_api_common(): can't read data
     major: Dataset
     minor: Read failed
-  #001: (file name) line (number) in H5VL_dataset_read(): dataset read failed
+  #002: (file name) line (number) in H5VL_dataset_read(): dataset read failed
     major: Virtual Object Layer
     minor: Read failed
-  #002: (file name) line (number) in H5VL__dataset_read(): dataset read failed
+  #003: (file name) line (number) in H5VL__dataset_read(): dataset read failed
     major: Virtual Object Layer
     minor: Read failed
-  #003: (file name) line (number) in H5VL__native_dataset_read(): can't read data
+  #004: (file name) line (number) in H5VL__native_dataset_read(): can't read data
     major: Dataset
     minor: Read failed
-  #004: (file name) line (number) in H5D__read(): can't read data
+  #005: (file name) line (number) in H5D__read(): can't read data
     major: Dataset
     minor: Read failed
-  #005: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
+  #006: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #006: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
+  #007: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Dataset
     minor: Filter operation failed
-  #007: (file name) line (number) in H5Z_pipeline(): required filter 'bogus' is not registered
+  #008: (file name) line (number) in H5Z_pipeline(): required filter 'bogus' is not registered
     major: Data filters
     minor: Read failed
-  #008: (file name) line (number) in H5PL_load(): filter plugins disabled
+  #009: (file name) line (number) in H5PL_load(): filter plugins disabled
     major: Plugin for dynamically loaded library
     minor: Unable to load metadata into cache