[svn-r12519] Fixed "make check-vfd"

"make check-vfd" will now run all tests in the test directory with different
file drivers (at least, all of those tests that use the testing framework's
FAPL).  Tests that fail will be skipped.

This is not a perfect fix, but is better than nothing.

Along with this change, check-vfd should be added to the Daily Tests.

1 files changed, 23 insertions, 11 deletions

diff --git a/test/reserved.c b/test/reserved.c
index d664a36..a0c0f9b 100755
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -424,18 +424,30 @@ main(void)
 {
     int num_errs=0;
     hid_t fapl;
-
-    num_errs+=rsrv_ohdr();
-    num_errs+=rsrv_heap();
-    num_errs+=rsrv_vlen();
-
-    if(num_errs > 0)
-        printf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
+    const char *envval = NULL;
+
+    envval = HDgetenv("HDF5_DRIVER");
+    if (envval == NULL) 
+        envval = "nomatch";
+    if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
+	num_errs+=rsrv_ohdr();
+	num_errs+=rsrv_heap();
+	num_errs+=rsrv_vlen();
+
+	if(num_errs > 0)
+	    printf("**** %d FAILURE%s! ****\n", num_errs, num_errs==1?"":"S");
+	else
+	    puts("All address space reservation tests passed.");
+
+	fapl = h5_fileaccess();
+	h5_cleanup(FILENAME, fapl);
+	return num_errs;
+    }
     else
-        puts("All address space reservation tests passed.");
+    {
+        puts("All address space reservation tests skippped - Incompatible with current Virtual File Driver");
+    }
+    return 0;
 
-    fapl = h5_fileaccess();
-    h5_cleanup(FILENAME, fapl);
-    return num_errs;
 }