diff options
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_mdset.c | 6 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 31 |
2 files changed, 4 insertions, 33 deletions
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); |