[svn-r15863] Description:

	Bring r15861 back from trunk to 1.8 release branch.

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, 0 insertions, 21 deletions

diff --git a/test/mf.c b/test/mf.c
index df8eb6f..b19e190 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -5559,27 +5559,6 @@ main(void)
     if(H5Pset_small_data_block_size(fapl, (hsize_t)TEST_BLOCK_SIZE2048) < 0)
 	TEST_ERROR
 
-    nerrors += test_mf_eoa(env_h5_drvr, fapl);
-    nerrors += test_mf_eoa_shrink(env_h5_drvr, fapl);
-    nerrors += test_mf_eoa_extend(env_h5_drvr, fapl);
-
-    /* interaction with free-space manager */
-    nerrors += test_mf_fs_start(fapl);
-    nerrors += test_mf_fs_alloc_free(fapl);
-    nerrors += test_mf_fs_extend(fapl);
-    nerrors += test_mf_fs_absorb(env_h5_drvr, fapl);
-
-    /* interaction with meta/sdata aggregator */
-    nerrors += test_mf_aggr_alloc1(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc2(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc3(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc4(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc5(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc6(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_alloc7(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_extend(env_h5_drvr, fapl);
-    nerrors += test_mf_aggr_absorb(env_h5_drvr, fapl);
-
     /* interaction with file allocation */
     nerrors += test_mf_eoa(env_h5_drvr, fapl);
     nerrors += test_mf_eoa_shrink(env_h5_drvr, fapl);