Better VFD SWMR parallel skip test

2 files changed, 10 insertions, 19 deletions

diff --git a/src/H5Fint.c b/src/H5Fint.c
index e1fa7d1..7815a47 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -1999,28 +1999,16 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
     /* Check if page buffering is enabled */
     if (H5P_get(a_plist, H5F_ACS_PAGE_BUFFER_SIZE_NAME, &page_buf_size) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get page buffer size")
-
-#ifdef H5_HAVE_PARALLEL
-{
-    hid_t driver_id = H5I_INVALID_HID; /* VFD ID */
-
-    /* Get the driver */
-    if ((driver_id = H5P_peek_driver(a_plist)) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get driver")
-    /* Temporary: fail file create when page buffering feature is enabled for parallel */
-    if (H5FD_MPIO == driver_id)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "page buffering is disabled for MPI-I/O VFD")
-}
-#endif /* H5_HAVE_PARALLEL */
-
     if (page_buf_size) {
 #ifdef H5_HAVE_PARALLEL
         /* Collective metadata writes are not supported with page buffering */
         if (file->shared->coll_md_write)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
                         "collective metadata writes are not supported with page buffering")
-#endif /* H5_HAVE_PARALLEL */
 
+        /* Temporary: fail file create when page buffering feature is enabled for parallel */
+        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "page buffering is disabled for parallel")
+#endif /* H5_HAVE_PARALLEL */
         /* Query for other page buffer cache properties */
         if (H5P_get(a_plist, H5F_ACS_PAGE_BUFFER_MIN_META_PERC_NAME, &page_buf_min_meta_perc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get minimum metadata fraction of page buffer")
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c
index 9c5899e..304b12a 100644
--- a/test/vfd_swmr.c
+++ b/test/vfd_swmr.c
@@ -3473,11 +3473,14 @@ main(void)
      * currently disabled for multi/split drivers.
      */
     if ((0 == HDstrcmp(env_h5_drvr, "multi")) || (0 == HDstrcmp(env_h5_drvr, "split"))) {
-
-        SKIPPED()
         HDputs("Skip VFD SWMR test because paged aggregation is disabled for multi/split drivers");
         HDexit(EXIT_SUCCESS);
-    } /* end if */
+    }
+
+#ifdef H5_HAVE_PARALLEL
+    HDputs("Skip VFD SWMR test because paged aggregation is disabled in parallel HDF5");
+    HDexit(EXIT_SUCCESS);
+#endif
 
     /* Set up */
     h5_reset();
@@ -3485,7 +3488,7 @@ main(void)
     if ((fapl = h5_fileaccess()) < 0) {
         nerrors++;
         PUTS_ERROR("Can't get VFD-dependent fapl")
-    } /* end if */
+    }
 
     nerrors += test_fapl();