[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, 47 insertions, 36 deletions

diff --git a/test/flush1.c b/test/flush1.c
index b5eb6a1..1fd3ca7 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -56,54 +56,65 @@ main(void)
     hsize_t	ch_size[2] = {5, 5};
     hsize_t	i, j;
     char	name[1024];
+    const char  *envval = NULL;
 
     h5_reset();
     fapl = h5_fileaccess();
 
     TESTING("H5Fflush (part1)");
+    envval = HDgetenv("HDF5_DRIVER");
+    if (envval == NULL) 
+        envval = "nomatch";
+    if (HDstrcmp(envval, "split")) {
+	/* Create the file */
+	h5_fixname(FILENAME[0], fapl, name, sizeof name);
+	if ((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error;
 
-    /* Create the file */
-    h5_fixname(FILENAME[0], fapl, name, sizeof name);
-    if ((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error;
+	/* Create a chunked dataset */
+	if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
+	if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error;
+	if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error;
+	if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0)
+	    goto error;
 
-    /* Create a chunked dataset */
-    if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
-    if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error;
-    if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error;
-    if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0)
-	goto error;
+	/* Write some data */
+	for (i=0; i<ds_size[0]; i++) {
+	    /*
+		* The extra cast in the following statement is a bug workaround
+		* for the Win32 version 5.0 compiler.
+		* 1998-11-06 ptl
+		*/
+	    for (j=0; j<ds_size[1]; j++) {
+		the_data[i][j] = (double)(hssize_t)i/(hssize_t)(j+1);
+	    }
+	}
+	if (H5Dwrite(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
+			the_data)<0) goto error;
 
-    /* Write some data */
-    for (i=0; i<ds_size[0]; i++) {
-	/*
-	 * The extra cast in the following statement is a bug workaround
-	 * for the Win32 version 5.0 compiler.
-	 * 1998-11-06 ptl
-	 */
-	for (j=0; j<ds_size[1]; j++) {
-	    the_data[i][j] = (double)(hssize_t)i/(hssize_t)(j+1);
+	/* Create some groups */
+	if ((groups=H5Gcreate(file, "some_groups", 0))<0) goto error;
+	for (i=0; i<100; i++) {
+	    sprintf(name, "grp%02u", (unsigned)i);
+	    if ((grp=H5Gcreate(groups, name, 0))<0) goto error;
+	    if (H5Gclose(grp)<0) goto error;
 	}
-    }
-    if (H5Dwrite(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
-		 the_data)<0) goto error;
 
-    /* Create some groups */
-    if ((groups=H5Gcreate(file, "some_groups", 0))<0) goto error;
-    for (i=0; i<100; i++) {
-	sprintf(name, "grp%02u", (unsigned)i);
-	if ((grp=H5Gcreate(groups, name, 0))<0) goto error;
-	if (H5Gclose(grp)<0) goto error;
+	/* Flush and exit without closing the library */
+	if (H5Fflush(file, H5F_SCOPE_GLOBAL)<0) goto error;
+	PASSED();
+	fflush(stdout);
+	fflush(stderr);
+    }
+    else
+    {
+        SKIPPED();
+        puts("    Test not compatible with current Virtual File Driver");
     }
 
-    /* Flush and exit without closing the library */
-    if (H5Fflush(file, H5F_SCOPE_GLOBAL)<0) goto error;
-    PASSED();
-    fflush(stdout);
-    fflush(stderr);
     HD_exit(0);
-    return 0;
 
- error:
-    HD_exit(1);
-    return 1;
+    error:
+        HD_exit(1);
+        return 1;
+
 }