[svn-r13871] Description:

    Fix problems with 'check-vfd' target, that were [mostly] introduced with
the recent "unique, but sharable" ISOHM optimization.

    The problems were mostly with using the 'core' VFD, so the
H5Pset_fapl_core() API call was changed to re-open existing files (therefore
operating more list the sec2, stdio, etc. VFDs).  This allows many more of
the tests to run using the 'core' VFD, so those were enabled also.

Tested on:
    Linux/64 2.6 (chicago2) w/check-vfd

1 files changed, 23 insertions, 13 deletions

diff --git a/test/ohdr.c b/test/ohdr.c
index d4b6ea4..a1d84a7 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -172,17 +172,27 @@ main(void)
          *  between 1-byte chunk #0 size encoding and 2-byte chunk #0 size encoding
          *  works correctly - QAK)
          */
-        if(H5O_close(&oh_loc) < 0)
-            FAIL_STACK_ERROR
-        if(H5Fclose(file) < 0)
-            FAIL_STACK_ERROR
-        if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-            FAIL_STACK_ERROR
-        if(NULL == (f = H5I_object(file)))
-            FAIL_STACK_ERROR
-        oh_loc.file = f;
-        if(H5O_open(&oh_loc) < 0)
-            FAIL_STACK_ERROR
+        TESTING("close & re-open object header");
+        envval = HDgetenv("HDF5_DRIVER");
+        if(envval == NULL) 
+            envval = "nomatch";
+        if(HDstrcmp(envval, "multi") && HDstrcmp(envval, "split") && HDstrcmp(envval, "family")) {
+            if(H5O_close(&oh_loc) < 0)
+                FAIL_STACK_ERROR
+            if(H5Fclose(file) < 0)
+                FAIL_STACK_ERROR
+            if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+                FAIL_STACK_ERROR
+            if(NULL == (f = H5I_object(file)))
+                FAIL_STACK_ERROR
+            oh_loc.file = f;
+            if(H5O_open(&oh_loc) < 0)
+                FAIL_STACK_ERROR
+        } /* end if */
+        else {
+            SKIPPED();
+            puts("   Test not compatible with current Virtual File Driver");
+        } /* end else */
 
         /*
          * Test creation of a bunch of messages one after another to see
@@ -221,11 +231,11 @@ main(void)
 
 
         /* Test reading datasets with undefined object header messages */
-        puts("Reading objects with unknown header messages");
+        TESTING("reading objects with unknown header messages");
         envval = HDgetenv("HDF5_DRIVER");
         if(envval == NULL) 
             envval = "nomatch";
-        if(HDstrcmp(envval, "core") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "split") && HDstrcmp(envval, "family")) {
+        if(HDstrcmp(envval, "multi") && HDstrcmp(envval, "split") && HDstrcmp(envval, "family")) {
             hid_t file2;                    /* File ID for 'bogus' object file */
             char testpath[512] = "";
             char testfile[512] = "";