From 7ce84a1d39930f96990dd6b9c0403170dfb5c8dc Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 30 Mar 2005 10:30:24 -0500 Subject: [svn-r10510] Purpose: Improvement. Description: The derived datatype test often hangs when it fails. This blocks daily test or automatic build. Run it only when hi verbose mode is used. Platforms tested: Tested in eirene pp. Misc. update: --- testpar/t_mpi.c | 70 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 97bac9c..29867c4 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -916,41 +916,49 @@ main(int argc, char **argv) fapl = H5Pcreate (H5P_FILE_ACCESS); H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL); - MPI_BANNER("MPIO complicated derived datatype test..."); - ret_code = test_mpio_derived_dtype(filenames[0]); + /* The derived datatype test hangs when it fails. This blocks + * daily test or automatic build. Run it only when hi verbose mode + * is used. + */ + if (!VERBOSE_HI){ + MPI_BANNER("MPIO complicated derived datatype test SKIPPED."); + }else{ + MPI_BANNER("MPIO complicated derived datatype test..."); + ret_code = test_mpio_derived_dtype(filenames[0]); #ifdef H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS - if(ret_code == -1) { - if(mpi_rank == 0) { - printf("Complicated derived datatype is NOT working at this platform\n"); - printf("Go back to hdf5/config and find the corresponding\n"); - printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n"); - printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n"); - printf(" at the end of the file.\n"); - printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n"); - } - ret_code = 1; - } + if(ret_code == -1) { + if(mpi_rank == 0) { + printf("Complicated derived datatype is NOT working at this platform\n"); + printf("Go back to hdf5/config and find the corresponding\n"); + printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n"); + printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n"); + printf(" at the end of the file.\n"); + printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n"); + } + ret_code = 1; + } #else - if(ret_code == 0) { - if(mpi_rank == 0) { - printf(" This is NOT an error, What it really says is\n"); - printf("Complicated derived datatype is WORKING at this platform\n"); - printf(" Go back to hdf5/config and find the corresponding \n"); - printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n"); - printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n"); - printf(" at the end of the file.\n"); - printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n"); - } - ret_code = 1; - } - if(ret_code == -1) ret_code = 0; + if(ret_code == 0) { + if(mpi_rank == 0) { + printf(" This is NOT an error, What it really says is\n"); + printf("Complicated derived datatype is WORKING at this platform\n"); + printf(" Go back to hdf5/config and find the corresponding \n"); + printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n"); + printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n"); + printf(" at the end of the file.\n"); + printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n"); + } + ret_code = 1; + } + if(ret_code == -1) ret_code = 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; - } + 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; + } #endif + } MPI_BANNER("MPIO 1 write Many read test..."); ret_code = test_mpio_1wMr(filenames[0], USENONE); -- cgit v0.12