diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-05-24 14:24:17 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-05-24 14:24:17 (GMT) |
| commit | 82ea7b2d3c02f1e345267a969a523066baa020d1 (patch) | |
| tree | 0a3e1d121bf5d72de2f45bff95a80955fa1efede /testpar | |
| parent | cb3f99d29b0edf8dc4765f19d8948384bf021519 (diff) | |
| download | hdf5-82ea7b2d3c02f1e345267a969a523066baa020d1.zip hdf5-82ea7b2d3c02f1e345267a969a523066baa020d1.tar.gz hdf5-82ea7b2d3c02f1e345267a969a523066baa020d1.tar.bz2 | |
[svn-r22402] HDFFV-8064: Merge windows #ifdef blocks to 1.8
Trunk dailies passed
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_mpi.c | 9 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index f05eee2..6e2348b 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -1178,12 +1178,17 @@ main(int argc, char **argv) * MPIO MPIO File size range test *=======================================*/ MPI_BANNER("MPIO File size range test..."); +#ifndef H5_HAVE_WIN32_API ret_code = test_mpio_gb_file(filenames[0]); ret_code = errors_sum(ret_code); if (mpi_rank==0 && ret_code > 0){ - printf("***FAILED with %d total errors\n", ret_code); - nerrors += ret_code; + printf("***FAILED with %d total errors\n", ret_code); + nerrors += ret_code; } +#else + if (mpi_rank==0) + printf(" will be skipped on Windows (JIRA HDDFV-8064)\n"); +#endif /*======================================= diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 4b5506f..8d6029c 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -411,9 +411,13 @@ int main(int argc, char **argv) AddTest("cngrpw", collective_group_write, NULL, "collective group and dataset write", &collngroups_params); AddTest("ingrpr", independent_group_read, NULL, - "independent group and dataset read", &collngroups_params); + "independent group and dataset read", &collngroups_params); +#ifndef H5_HAVE_WIN32_API AddTest("bigdset", big_dataset, NULL, "big dataset test", PARATESTFILE); +#else + printf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n"); +#endif AddTest("fill", dataset_fillvalue, NULL, "dataset fill value", PARATESTFILE); |