[svn-r15868] Description:

	Correct a minor error in file free space allocation which was affecting
the 'multi' VFD and preventing some tests from fully working with it.

	Wholesale revisitation of all the places where tests were disabled
with various VFDs and remove or correct all these so that _only_ the tests
which _really_ can't work with particular VFDs are skipped during a
'make check-vfd' test.

Tested on:
        Mac OS X/32 10.5.5 (amazon) in debug mode
        Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

1 files changed, 47 insertions, 63 deletions

diff --git a/test/flush2.c b/test/flush2.c
index 0304406..5675856 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -159,90 +159,74 @@ main(void)
 {
     hid_t fapl;
     H5E_auto2_t func;
-
     char	name[1024];
-    const char *envval = NULL;
 
     h5_reset();
     fapl = h5_fileaccess();
     TESTING("H5Fflush (part2 with flush)");
 
-    /* Don't run this test using the core or split file drivers */
-    envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL)
-        envval = "nomatch";
-    if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) {
-	/* Check the case where the file was flushed */
-	h5_fixname(FILENAME[0], fapl, name, sizeof name);
-	if(check_file(name, fapl, FALSE)) {
-	    H5_FAILED()
-	    goto error;
-	}
-	else
-	    PASSED();
+    /* Check the case where the file was flushed */
+    h5_fixname(FILENAME[0], fapl, name, sizeof name);
+    if(check_file(name, fapl, FALSE)) {
+        H5_FAILED()
+        goto error;
+    }
+    else
+        PASSED();
 
 
-	/* Check the case where the file was not flushed.  This should give an error
-	 * so we turn off the error stack temporarily */
-	TESTING("H5Fflush (part2 without flush)");
-	H5Eget_auto2(H5E_DEFAULT,&func,NULL);
-	H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+    /* Check the case where the file was not flushed.  This should give an error
+     * so we turn off the error stack temporarily */
+    TESTING("H5Fflush (part2 without flush)");
+    H5Eget_auto2(H5E_DEFAULT,&func,NULL);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
-	h5_fixname(FILENAME[1], fapl, name, sizeof name);
-	if(check_file(name, fapl, FALSE))
-	    PASSED()
-	else
-	{
+    h5_fixname(FILENAME[1], fapl, name, sizeof name);
+    if(check_file(name, fapl, FALSE))
+        PASSED()
+    else
+    {
 #if defined _WIN32 && defined _HDF5USEDLL_
-	SKIPPED();
-	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
+    SKIPPED();
+    puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
 #elif defined H5_VMS
-        SKIPPED();
+    SKIPPED();
 #else
-        H5_FAILED()
-        goto error;
+    H5_FAILED()
+    goto error;
 #endif
-	}
-	H5Eset_auto2(H5E_DEFAULT, func, NULL);
-
-	/* Check the case where the file was flushed, but more data was added afterward.  This should give an error
-	 * so we turn off the error stack temporarily */
-	TESTING("H5Fflush (part2 with flush and later addition)");
-	H5Eget_auto2(H5E_DEFAULT,&func,NULL);
-	H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
-	h5_fixname(FILENAME[2], fapl, name, sizeof name);
-	if(check_file(name, fapl, TRUE))
-	    PASSED()
-	else
-	{
+    }
+    H5Eset_auto2(H5E_DEFAULT, func, NULL);
+
+    /* Check the case where the file was flushed, but more data was added afterward.  This should give an error
+     * so we turn off the error stack temporarily */
+    TESTING("H5Fflush (part2 with flush and later addition)");
+    H5Eget_auto2(H5E_DEFAULT,&func,NULL);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
+    h5_fixname(FILENAME[2], fapl, name, sizeof name);
+    if(check_file(name, fapl, TRUE))
+        PASSED()
+    else
+    {
 #if defined _WIN32 && defined _HDF5USEDLL_
-	SKIPPED();
-	puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
+    SKIPPED();
+    puts("   DLL will flush the file even when calling _exit, skip this test temporarily");
 #elif defined H5_VMS
-        SKIPPED();
+    SKIPPED();
 #else
-        H5_FAILED()
-        goto error;
+    H5_FAILED()
+    goto error;
 #endif
 
-	}
-	H5Eset_auto2(H5E_DEFAULT, func, NULL);
+    }
+    H5Eset_auto2(H5E_DEFAULT, func, NULL);
 
+    h5_cleanup(FILENAME, fapl);
 
-	h5_cleanup(FILENAME, fapl);
-    }
-    else
-    {
-        SKIPPED();
-        puts("    Test not compatible with current Virtual File Driver");
-    }
     return 0;
 
-    error:
-        return 1;
+error:
+    return 1;
 }
 
-
-
-