[svn-r15869] Description:

	Bring r15868 from trunk to 1.8 release branch:

	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, 44 insertions, 52 deletions

diff --git a/test/mount.c b/test/mount.c
index 9f07123..25af851 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -4222,59 +4222,51 @@ main(void)
 {
     int		nerrors = 0;
     hid_t	fapl = -1;
-    const char *envval = NULL;
-
-    envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL)
-        envval = "nomatch";
-    if (HDstrcmp(envval, "split") && HDstrcmp(envval, "multi")) {
-	h5_reset();
-	fapl = h5_fileaccess();
-	if (setup(fapl) < 0) goto error;
-
-	nerrors += test_basic(fapl);
-	nerrors += test_illegal(fapl);
-	nerrors += test_samefile(fapl);
-	nerrors += test_hide(fapl);
-	nerrors += test_assoc(fapl);
-	nerrors += test_mntlnk(fapl);
-	nerrors += test_unlink(fapl);
-	nerrors += test_move(fapl);
-	nerrors += test_mvmpt(fapl);
-	nerrors += test_preopen(fapl);
-	nerrors += test_postopen(fapl);
-	nerrors += test_interlink(fapl);
-	nerrors += test_uniformity(fapl);
-	nerrors += test_close(fapl);
-	nerrors += test_mount_after_close(fapl);
-	nerrors += test_mount_after_unmount(fapl);
-	nerrors += test_missing_unmount(fapl);
-	nerrors += test_hold_open_file(fapl);
-	nerrors += test_hold_open_group(fapl);
-	nerrors += test_fcdegree_same(fapl);
-	nerrors += test_fcdegree_semi(fapl);
-	nerrors += test_fcdegree_strong(fapl);
-	nerrors += test_acc_perm(fapl);
-	nerrors += test_mult_mount(fapl);
-	nerrors += test_nested_survive(fapl);
-	nerrors += test_close_parent(fapl);
-	nerrors += test_cut_graph(fapl);
-	nerrors += test_symlink(fapl);
-	nerrors += test_sharedacc(fapl);
-	nerrors += test_sharedclose(fapl);
-
-	if (nerrors) goto error;
-	puts("All mount tests passed.");
-	h5_cleanup(FILENAME, fapl);
-    }
-    else
-    {
-        puts("All mount tests skipped - Incompatible with current Virtual File Driver");
-    }
+
+    h5_reset();
+    fapl = h5_fileaccess();
+    if (setup(fapl) < 0) goto error;
+
+    nerrors += test_basic(fapl);
+    nerrors += test_illegal(fapl);
+    nerrors += test_samefile(fapl);
+    nerrors += test_hide(fapl);
+    nerrors += test_assoc(fapl);
+    nerrors += test_mntlnk(fapl);
+    nerrors += test_unlink(fapl);
+    nerrors += test_move(fapl);
+    nerrors += test_mvmpt(fapl);
+    nerrors += test_preopen(fapl);
+    nerrors += test_postopen(fapl);
+    nerrors += test_interlink(fapl);
+    nerrors += test_uniformity(fapl);
+    nerrors += test_close(fapl);
+    nerrors += test_mount_after_close(fapl);
+    nerrors += test_mount_after_unmount(fapl);
+    nerrors += test_missing_unmount(fapl);
+    nerrors += test_hold_open_file(fapl);
+    nerrors += test_hold_open_group(fapl);
+    nerrors += test_fcdegree_same(fapl);
+    nerrors += test_fcdegree_semi(fapl);
+    nerrors += test_fcdegree_strong(fapl);
+    nerrors += test_acc_perm(fapl);
+    nerrors += test_mult_mount(fapl);
+    nerrors += test_nested_survive(fapl);
+    nerrors += test_close_parent(fapl);
+    nerrors += test_cut_graph(fapl);
+    nerrors += test_symlink(fapl);
+    nerrors += test_sharedacc(fapl);
+    nerrors += test_sharedclose(fapl);
+
+    if (nerrors) goto error;
+
+    puts("All mount tests passed.");
+    h5_cleanup(FILENAME, fapl);
+
     return 0;
 
-    error:
-        puts("***** MOUNT ERRORS *****");
-        return 1;
+error:
+    puts("***** MOUNT ERRORS *****");
+    return 1;
 }