[svn-r17417] Description:

	Bring r17365:17416 from trunk to revise_chunks branch

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) 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 debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

3 files changed, 5 insertions, 34 deletions

diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 4e1e5ba..9bf3a8d 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -5449,7 +5449,7 @@ trace_file_check(void)
       "H5AC_unpin_entry 4 0\n",
       "H5AC_rename 0 8a65 15 0\n",
       "H5AC_rename 8a65 0 15 0\n",
-      "H5AC_flush 0x0 0\n",
+      "H5AC_flush 0\n",
       NULL
     };
     char buffer[256];
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index f7d7ebb..51f06d7 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -458,7 +458,7 @@ void big_dataset(void)
 
     /* Check that file of the correct size was created */
     file_size = h5_get_file_size(filename, fapl);
-    VRFY((file_size == 2147485696ULL), "File is correct size(~2GB)");
+    VRFY((file_size == 2147485792ULL), "File is correct size(~2GB)");
 
     /*
      * Create >4GB HDF5 file
@@ -487,7 +487,7 @@ void big_dataset(void)
 
     /* Check that file of the correct size was created */
     file_size = h5_get_file_size(filename, fapl);
-    VRFY((file_size == 4294969344ULL), "File is correct size(~4GB)");
+    VRFY((file_size == 4294969440ULL), "File is correct size(~4GB)");
 
     /*
      * Create >8GB HDF5 file
@@ -516,7 +516,7 @@ void big_dataset(void)
 
     /* Check that file of the correct size was created */
     file_size = h5_get_file_size(filename, fapl);
-    VRFY((file_size == 8589936640ULL), "File is correct size(~8GB)");
+    VRFY((file_size == 8589936736ULL), "File is correct size(~8GB)");
 
     /* Close fapl */
     ret = H5Pclose(fapl);
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 175d159..4dabada 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -402,7 +402,7 @@ int main(int argc, char **argv)
 	    "collective group and dataset write", &collngroups_params);
     AddTest("ingrpr", independent_group_read, NULL,
 	    "independent group and dataset read", &collngroups_params);
-				 AddTest("bigdset", big_dataset, NULL,
+    AddTest("bigdset", big_dataset, NULL,
             "big dataset test", PARATESTFILE);
     AddTest("fill", dataset_fillvalue, NULL,
 	    "dataset fill value", PARATESTFILE);
@@ -463,35 +463,6 @@ int main(int argc, char **argv)
 	"collective irregular complex chunk read",PARATESTFILE);
 
 
-#if 0
-    if((mpi_size > 3) && MAINPROCESS) {
-	printf("Collective irregular chunk IO tests haven't been tested \n");
-	printf("  for the number of process greater than 3.\n");
-	printf("Please try with the number of process \n");
-	printf("  no greater than 3 for collective irregular chunk IO test.\n");
-	printf("Collective irregular chunk tests will be skipped \n");
-    }
-    AddTest((mpi_size > 3) ? "-ccontw" : "ccontw",
-	coll_irregular_cont_write,NULL,
-	"collective irregular contiguous write",PARATESTFILE);
-    AddTest((mpi_size > 3) ? "-ccontr" : "ccontr",
-	coll_irregular_cont_read,NULL,
-	"collective irregular contiguous read",PARATESTFILE);
-    AddTest((mpi_size > 3) ? "-cschunkw" : "cschunkw",
-	coll_irregular_simple_chunk_write,NULL,
-	"collective irregular simple chunk write",PARATESTFILE);
-    AddTest((mpi_size > 3) ? "-cschunkr" : "cschunkr",
-	coll_irregular_simple_chunk_read,NULL,
-	"collective irregular simple chunk read",PARATESTFILE);
-    AddTest((mpi_size > 3) ? "-ccchunkw" : "ccchunkw",
-	coll_irregular_complex_chunk_write,NULL,
-	"collective irregular complex chunk write",PARATESTFILE);
-    AddTest((mpi_size > 3) ? "-ccchunkr" : "ccchunkr",
-	coll_irregular_complex_chunk_read,NULL,
-	"collective irregular complex chunk read",PARATESTFILE);
-#endif
-
-
     AddTest("null", null_dataset, NULL,
 	    "null dataset test", PARATESTFILE);