Sync test dir w/ develop (#3303)

1 files changed, 27 insertions, 22 deletions

diff --git a/test/chunk_info.c b/test/chunk_info.c
index 99430f9..cb79dc1 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -44,8 +44,13 @@
 #endif
 
 /* Test file names, using H5F_libver_t as indices */
-const char *FILENAME[] = {"tchunk_info_earliest", "tchunk_info_v18",  "tchunk_info_v110",
-                          "tchunk_info_v112",     "tchunk_info_v114", NULL};
+static const char *FILENAME[] = {"tchunk_info_earliest",
+                                 "tchunk_info_v18",
+                                 "tchunk_info_v110",
+                                 "tchunk_info_v112",
+                                 "tchunk_info_v114",
+                                 "tchunk_info_v116",
+                                 NULL};
 
 /* File to be used in test_failed_attempts */
 #define FILTERMASK_FILE "tflt_msk"
@@ -629,7 +634,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, H5S_ALL, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt to get info of a non-existing chunk.");
 
@@ -686,7 +691,7 @@ test_get_chunk_info_highest_v18(hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt to get info of a non-existing chunk.");
 
@@ -786,7 +791,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -910,7 +915,7 @@ test_chunk_info_single_chunk(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
 
@@ -933,7 +938,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1052,7 +1057,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1158,7 +1163,7 @@ test_chunk_info_fixed_array(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempted to get info of a chunk using an out-of-range index.");
 
@@ -1195,7 +1200,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1307,7 +1312,7 @@ test_chunk_info_extensible_array(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempted to get info of a chunk using an out-of-range index.");
 
@@ -1344,7 +1349,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1456,7 +1461,7 @@ test_chunk_info_version2_btrees(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempted to get info of a chunk using an out-of-range index.");
 
@@ -1493,7 +1498,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1653,7 +1658,7 @@ test_basic_query(hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
 
@@ -1732,7 +1737,7 @@ test_basic_query(hid_t fapl)
     {
         ret = H5Dchunk_iter(dset, H5P_DEFAULT, &iter_cb_fail, &cptr);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
     if (cptr != &(chunk_infos[1]))
@@ -1762,7 +1767,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(basicfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -1840,7 +1845,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
     {
         ret = H5Dget_num_chunks(dset, dspace, &nchunks);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt a chunk query function on a contiguous dataset.");
 
@@ -1851,7 +1856,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info(dset, dspace, chk_index, out_offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt a chunk query function on a contiguous dataset.");
 
@@ -1863,7 +1868,7 @@ test_failed_attempts(const char *filename, hid_t fapl)
     {
         ret = H5Dget_chunk_info_by_coord(dset, offset, &read_flt_msk, &addr, &size);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         FAIL_PUTS_ERROR("    Attempt a chunk query function on a contiguous dataset.");
 
@@ -1885,7 +1890,7 @@ error:
         H5Sclose(dspace);
         H5Fclose(chunkfile);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;
@@ -2173,7 +2178,7 @@ error:
         H5Pclose(dxpl);
         H5Fclose(filter_file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5_FAILED();
     return FAIL;