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, 12 insertions, 0 deletions

diff --git a/test/efc.c b/test/efc.c
index d63ef34..b427884 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -20,6 +20,7 @@
 #include "H5Fpkg.h"
 #include "H5CXprivate.h"        /* API Contexts                         */
 #include "H5Iprivate.h"
+#include "H5Pprivate.h"         /* Property lists                       */
 
 const char *FILENAME[] = {
     "efc0",
@@ -2896,6 +2897,8 @@ int
 main(void)
 {
     unsigned nerrors = 0;        /* track errors */
+    H5P_genplist_t *plist;      /* Property list pointer for FAPL */
+    H5VL_connector_prop_t connector_prop; /* Property for VOL connector ID & info        */
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
     /* Test Setup */
@@ -2917,6 +2920,15 @@ main(void)
     if(H5CX_push() < 0) FAIL_STACK_ERROR
     api_ctx_pushed = TRUE;
 
+    /* Get the VOL info from the fapl */
+    plist = (H5P_genplist_t *)H5I_object(fapl_id);
+    H5P_peek(plist, H5F_ACS_VOL_CONN_NAME, &connector_prop);
+
+    /* Stash a copy of the "top-level" connector property, before any pass-through
+     *  connectors modify or unwrap it.
+     */
+    H5CX_set_vol_connector_prop(&connector_prop);
+
     /* Test Functions */
     nerrors += test_single();
     nerrors += test_graph_nocycle();