Corrected comment in src/H5VLint.c, fixed pass-through info size in

src/H5VLpassthru.c, switched to stashing VOL connector ID & info in
API context (in src/H5CX.c, src/H5CXprivate.h, src/H5F.c, src/H5Fint.c, and
src/H5Fefc.c), patched up all sorts of issues in the tests, to make them work
with 'check-vfd' (and 'check-vol' again).

1 files changed, 196 insertions, 60 deletions

diff --git a/test/cache_image.c b/test/cache_image.c
index 10e9a8a..10c37f0 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -40,27 +40,27 @@ static void attempt_swmr_open_hdf5_file(hbool_t create_file,
 static void verify_datasets(hid_t file_id, int min_dset, int max_dset);
 
 /* local test function declarations */
-static unsigned check_cache_image_ctl_flow_1(void);
-static unsigned check_cache_image_ctl_flow_2(void);
-static unsigned check_cache_image_ctl_flow_3(void);
-static unsigned check_cache_image_ctl_flow_4(void);
-static unsigned check_cache_image_ctl_flow_5(void);
-static unsigned check_cache_image_ctl_flow_6(void);
-
-static unsigned cache_image_smoke_check_1(void);
-static unsigned cache_image_smoke_check_2(void);
-static unsigned cache_image_smoke_check_3(void);
-static unsigned cache_image_smoke_check_4(void);
-static unsigned cache_image_smoke_check_5(void);
-static unsigned cache_image_smoke_check_6(void);
-
-static unsigned cache_image_api_error_check_1(void);
-static unsigned cache_image_api_error_check_2(void);
-static unsigned cache_image_api_error_check_3(void);
-static unsigned cache_image_api_error_check_4(void);
-
-static unsigned get_free_sections_test(void);
-static unsigned evict_on_close_test(void);
+static unsigned check_cache_image_ctl_flow_1(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_2(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_3(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_4(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_5(hbool_t single_file_vfd);
+static unsigned check_cache_image_ctl_flow_6(hbool_t single_file_vfd);
+
+static unsigned cache_image_smoke_check_1(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_2(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_3(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_4(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_5(hbool_t single_file_vfd);
+static unsigned cache_image_smoke_check_6(hbool_t single_file_vfd);
+
+static unsigned cache_image_api_error_check_1(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_2(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_3(hbool_t single_file_vfd);
+static unsigned cache_image_api_error_check_4(hbool_t single_file_vfd);
+
+static unsigned get_free_sections_test(hbool_t single_file_vfd);
+static unsigned evict_on_close_test(hbool_t single_file_vfd);
 
 
 /****************************************************************************/
@@ -1329,7 +1329,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
  */
 
 static unsigned
-check_cache_image_ctl_flow_1(void)
+check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_1()";
     char filename[512];
@@ -1341,6 +1341,13 @@ check_cache_image_ctl_flow_1(void)
 
     TESTING("metadata cache image control flow test 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -1608,7 +1615,7 @@ check_cache_image_ctl_flow_1(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_2(void)
+check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_2()";
     char filename[512];
@@ -1620,6 +1627,13 @@ check_cache_image_ctl_flow_2(void)
 
     TESTING("metadata cache image control flow test 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -1871,7 +1885,7 @@ check_cache_image_ctl_flow_2(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_3(void)
+check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_3()";
     char filename[512];
@@ -1883,6 +1897,13 @@ check_cache_image_ctl_flow_3(void)
 
     TESTING("metadata cache image control flow test 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2242,7 +2263,7 @@ check_cache_image_ctl_flow_3(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_4(void)
+check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_4()";
     char filename[512];
@@ -2254,6 +2275,13 @@ check_cache_image_ctl_flow_4(void)
 
     TESTING("metadata cache image control flow test 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2573,7 +2601,7 @@ check_cache_image_ctl_flow_4(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_5(void)
+check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_5()";
     char filename[512];
@@ -2585,6 +2613,13 @@ check_cache_image_ctl_flow_5(void)
 
     TESTING("metadata cache image control flow test 5");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -2854,7 +2889,7 @@ check_cache_image_ctl_flow_5(void)
  */
 
 static unsigned
-check_cache_image_ctl_flow_6(void)
+check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
 {
     const char * fcn_name = "check_cache_image_ctl_flow_6()";
     char filename[512];
@@ -2866,6 +2901,13 @@ check_cache_image_ctl_flow_6(void)
 
     TESTING("metadata cache image control flow test 6");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) /* 0 */
@@ -3139,7 +3181,7 @@ check_cache_image_ctl_flow_6(void)
  */
 
 static unsigned
-cache_image_smoke_check_1(void)
+cache_image_smoke_check_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_1()";
     char filename[512];
@@ -3151,6 +3193,13 @@ cache_image_smoke_check_1(void)
 
     TESTING("metadata cache image smoke check 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -3562,7 +3611,7 @@ cache_image_smoke_check_1(void)
  */
 
 static unsigned
-cache_image_smoke_check_2(void)
+cache_image_smoke_check_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_2()";
     char filename[512];
@@ -3574,6 +3623,13 @@ cache_image_smoke_check_2(void)
 
     TESTING("metadata cache image smoke check 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -3863,7 +3919,7 @@ cache_image_smoke_check_2(void)
  */
 
 static unsigned
-cache_image_smoke_check_3(void)
+cache_image_smoke_check_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_3()";
     char filename[512];
@@ -3875,6 +3931,13 @@ cache_image_smoke_check_3(void)
 
     TESTING("metadata cache image smoke check 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -4248,7 +4311,7 @@ cache_image_smoke_check_3(void)
  */
 
 static unsigned
-cache_image_smoke_check_4(void)
+cache_image_smoke_check_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_4()";
     char filename[512];
@@ -4262,6 +4325,13 @@ cache_image_smoke_check_4(void)
 
     TESTING("metadata cache image smoke check 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -4653,7 +4723,7 @@ cache_image_smoke_check_4(void)
 #define MAX_NUM_GROUPS 128
 
 static unsigned
-cache_image_smoke_check_5(void)
+cache_image_smoke_check_5(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_5()";
     char filename[512];
@@ -4670,6 +4740,13 @@ cache_image_smoke_check_5(void)
 
     TESTING("metadata cache image smoke check 5");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -5168,7 +5245,7 @@ cache_image_smoke_check_5(void)
  */
 
 static unsigned
-cache_image_smoke_check_6(void)
+cache_image_smoke_check_6(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_smoke_check_6()";
     char filename[512];
@@ -5183,6 +5260,13 @@ cache_image_smoke_check_6(void)
 
     TESTING("metadata cache image smoke check 6");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -5578,7 +5662,7 @@ cache_image_smoke_check_6(void)
  */
 
 static unsigned
-cache_image_api_error_check_1(void)
+cache_image_api_error_check_1(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_1()";
     char filename[512];
@@ -5590,6 +5674,13 @@ cache_image_api_error_check_1(void)
 
     TESTING("metadata cache image api error check 1");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -5954,7 +6045,7 @@ cache_image_api_error_check_1(void)
  */
 
 static unsigned
-cache_image_api_error_check_2(void)
+cache_image_api_error_check_2(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_2()";
     char filename[512];
@@ -5966,6 +6057,13 @@ cache_image_api_error_check_2(void)
 
     TESTING("metadata cache image api error check 2");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -6365,7 +6463,7 @@ cache_image_api_error_check_2(void)
  */
 
 static unsigned
-cache_image_api_error_check_3(void)
+cache_image_api_error_check_3(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_3()";
     char filename[512];
@@ -6377,6 +6475,13 @@ cache_image_api_error_check_3(void)
 
     TESTING("metadata cache image api error check 3");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -6649,7 +6754,7 @@ cache_image_api_error_check_3(void)
  */
 
 static unsigned
-cache_image_api_error_check_4(void)
+cache_image_api_error_check_4(hbool_t single_file_vfd)
 {
     const char * fcn_name = "cache_image_api_error_check_4()";
     char filename[512];
@@ -6663,6 +6768,13 @@ cache_image_api_error_check_4(void)
 
     TESTING("metadata cache image api error check 4");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -7238,7 +7350,7 @@ cache_image_api_error_check_4(void)
  *-------------------------------------------------------------------------
  */
 static unsigned
-get_free_sections_test(void)
+get_free_sections_test(hbool_t single_file_vfd)
 {
     const char * fcn_name = "get_free_sections_test()";
     char filename[512];
@@ -7251,6 +7363,13 @@ get_free_sections_test(void)
 
     TESTING("Cache image / H5Fget_free_sections() interaction");
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -7710,7 +7829,7 @@ get_free_sections_test(void)
  *-------------------------------------------------------------------------
  */
 static unsigned
-evict_on_close_test(void)
+evict_on_close_test(hbool_t single_file_vfd)
 {
 #ifndef H5_HAVE_PARALLEL
     const char * fcn_name = "evict_on_close_test()";
@@ -7731,6 +7850,13 @@ evict_on_close_test(void)
     return 0;
 #else
 
+    /* Check for VFD that is a single file */
+    if(!single_file_vfd) {
+        SKIPPED();
+        HDputs("    Cache image not supported with the current VFD.");
+        return 0;
+    }
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -8041,9 +8167,16 @@ evict_on_close_test(void)
 int
 main(void)
 {
+    const char  *env_h5_drvr;   /* File driver value from environment */
+    hbool_t single_file_vfd;    /* Whether VFD used stores data in a single file */
     unsigned nerrs = 0;
     int express_test;
 
+    /* Get the VFD to use */
+    env_h5_drvr = HDgetenv("HDF5_DRIVER");
+    if(env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
     H5open();
 
     express_test = GetTestExpress();
@@ -8053,27 +8186,30 @@ main(void)
     printf("        express_test = %d\n", express_test);
     printf("=========================================\n");
 
-    nerrs += check_cache_image_ctl_flow_1();
-    nerrs += check_cache_image_ctl_flow_2();
-    nerrs += check_cache_image_ctl_flow_3();
-    nerrs += check_cache_image_ctl_flow_4();
-    nerrs += check_cache_image_ctl_flow_5();
-    nerrs += check_cache_image_ctl_flow_6();
-
-    nerrs += cache_image_smoke_check_1();
-    nerrs += cache_image_smoke_check_2();
-    nerrs += cache_image_smoke_check_3();
-    nerrs += cache_image_smoke_check_4();
-    nerrs += cache_image_smoke_check_5();
-    nerrs += cache_image_smoke_check_6();
-
-    nerrs += cache_image_api_error_check_1();
-    nerrs += cache_image_api_error_check_2();
-    nerrs += cache_image_api_error_check_3();
-    nerrs += cache_image_api_error_check_4();
-
-    nerrs += get_free_sections_test();
-    nerrs += evict_on_close_test();
+    /* Check for VFD which stores data in multiple files */
+    single_file_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family"));
+
+    nerrs += check_cache_image_ctl_flow_1(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_2(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_3(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_4(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_5(single_file_vfd);
+    nerrs += check_cache_image_ctl_flow_6(single_file_vfd);
+
+    nerrs += cache_image_smoke_check_1(single_file_vfd);
+    nerrs += cache_image_smoke_check_2(single_file_vfd);
+    nerrs += cache_image_smoke_check_3(single_file_vfd);
+    nerrs += cache_image_smoke_check_4(single_file_vfd);
+    nerrs += cache_image_smoke_check_5(single_file_vfd);
+    nerrs += cache_image_smoke_check_6(single_file_vfd);
+
+    nerrs += cache_image_api_error_check_1(single_file_vfd);
+    nerrs += cache_image_api_error_check_2(single_file_vfd);
+    nerrs += cache_image_api_error_check_3(single_file_vfd);
+    nerrs += cache_image_api_error_check_4(single_file_vfd);
+
+    nerrs += get_free_sections_test(single_file_vfd);
+    nerrs += evict_on_close_test(single_file_vfd);
 
     return(nerrs > 0);