Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into develop

4 files changed, 27 insertions, 51 deletions

diff --git a/java/test/testfiles/JUnit-TestH5Edefault.txt b/java/test/testfiles/JUnit-TestH5Edefault.txt
index 48c6254..bb43c64 100644
--- a/java/test/testfiles/JUnit-TestH5Edefault.txt
+++ b/java/test/testfiles/JUnit-TestH5Edefault.txt
@@ -1,10 +1,8 @@
 JUnit version 4.11
-.testH5EprintInt
 .testH5Eset_current_stack_invalid_stkid
 .testH5Eset_current_stack
 .testH5Eget_num
 .testH5Eclear
-.testH5Eprint
 .testH5Epush_null_name
 .testH5Eget_num_with_msg
 .testH5Eclear2_with_msg
@@ -30,49 +28,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (28 tests)
+OK (26 tests)
 
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Fopen(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #001: (file name) line (number) in H5VL_file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_file_open(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
-    major: File accessibility
-    minor: Unable to open file
-  #005: (file name) line (number) in H5FD_open(): open failed
-    major: Virtual File Layer
-    minor: Unable to initialize object
-  #006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
-    major: File accessibility
-    minor: Unable to open file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Fopen(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #001: (file name) line (number) in H5VL_file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_file_open(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
-    major: File accessibility
-    minor: Unable to open file
-  #005: (file name) line (number) in H5FD_open(): open failed
-    major: Virtual File Layer
-    minor: Unable to initialize object
-  #006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
-    major: File accessibility
-    minor: Unable to open file
diff --git a/java/test/testfiles/JUnit-TestH5Obasic.txt b/java/test/testfiles/JUnit-TestH5Obasic.txt
index d015bdd..c39c01d 100644
--- a/java/test/testfiles/JUnit-TestH5Obasic.txt
+++ b/java/test/testfiles/JUnit-TestH5Obasic.txt
@@ -1,29 +1,45 @@
 JUnit version 4.11
 .testH5Oexists_by_name
+.testH5Oget_native_info_dataset
+.testH5Oopen_by_token
 .testH5Oget_info_by_idx_n0
 .testH5Oget_info_by_idx_n3
+.testH5Oget_native_info_datatype
 .testH5Oget_info_by_name_not_exist_name
 .testH5Ovisit_by_name
+.testH5Oget_native_info_by_name_datatype
 .testH5Oget_info_by_idx_name_not_exist_name
 .testH5Oget_info_datatype
 .testH5Oget_info_by_idx_not_exist_name
 .testH5Oopen_by_idx_n0
 .testH5Oopen_by_idx_n3
+.testH5Oget_native_info_by_name_not_exist_name
 .testH5Oopen_not_exists
 .testH5Ovisit
 .testH5Oget_info_by_idx_not_exist_create
+.testH5Oget_native_info_by_idx_not_exist_name
 .testH5Oget_info_by_name_hardlink
 .testH5Oget_info_by_name_group
-.testH5Oopen_by_addr
 .testH5Oget_info_by_name_not_exists
+.testH5Oget_native_info_by_idx_not_exist_create
 .testH5Oget_info_by_name_dataset
 .testH5Oget_info_group
+.testH5Oget_native_info_hardlink
+.testH5Oget_native_info_by_name_hardlink
+.testH5Oget_native_info_by_idx_name_not_exist_name
 .testH5Oget_info_by_name_datatype
 .testH5Oget_info_hardlink
+.testH5Oget_native_info_group
+.testH5Oget_native_info_by_name_not_exists
+.testH5Oget_native_info_by_name_dataset
 .testH5Oget_info_by_idx_name_not_exist_create
+.testH5Oget_native_info_by_idx_n0
+.testH5Oget_native_info_by_idx_n3
 .testH5Oget_info_dataset
+.testH5Oget_native_info_by_name_group
+.testH5Oget_native_info_by_idx_name_not_exist_create
 
 Time:  XXXX
 
-OK (23 tests)
+OK (39 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Oparams.txt b/java/test/testfiles/JUnit-TestH5Oparams.txt
index bc23695..b756bcf 100644
--- a/java/test/testfiles/JUnit-TestH5Oparams.txt
+++ b/java/test/testfiles/JUnit-TestH5Oparams.txt
@@ -1,22 +1,27 @@
 JUnit version 4.11
 .testH5Oget_comment_by_name_null
+.testH5Oget_native_info_by_name_invalid
 .testH5Ovisit_by_name_nullname
 .testH5Oget_info_invalid
 .testH5Ovisit_by_name_null
 .testH5Odisable_mdc_flushes
 .testH5Oget_comment_invalid
+.testH5Oget_native_info_invalid
 .testH5Oset_comment_by_name_invalid
 .testH5Oare_mdc_flushes_disabled
 .testH5Oopen_null
 .testH5Oclose_invalid
 .testH5Oflush_invalid
+.testH5Oget_native_info_by_name_null
 .testH5Oget_comment_by_name_invalid
 .testH5Orefresh_invalid
 .testH5Ocopy_null_dest
+.testH5Oget_native_info_by_idx_null
 .testH5Olink_invalid
 .testH5Oget_info_by_idx_invalid
 .testH5Oget_info_by_idx_null
 .testH5Olink_null_dest
+.testH5Oget_native_info_by_idx_invalid
 .testH5Oget_info_by_name_invalid
 .testH5Oget_info_by_name_null
 .testH5Ocopy_invalid
@@ -29,5 +34,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (27 tests)
+OK (32 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5VL.txt b/java/test/testfiles/JUnit-TestH5VL.txt
index caadf26..f646009 100644
--- a/java/test/testfiles/JUnit-TestH5VL.txt
+++ b/java/test/testfiles/JUnit-TestH5VL.txt
@@ -1,4 +1,5 @@
 JUnit version 4.11
+.testH5VLget_connector_id_by_name
 .testH5VLget_connector_id
 .testH5VLnative_init
 .testH5VLget_connector_name
@@ -7,5 +8,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (5 tests)
+OK (6 tests)