diff options
| -rw-r--r-- | test/h5test.h | 1 | ||||
| -rw-r--r-- | test/testframe.c | 16 | ||||
| -rw-r--r-- | testpar/t_2Gio.c | 2 | ||||
| -rw-r--r-- | testpar/t_shapesame.c | 2 | ||||
| -rw-r--r-- | testpar/testphdf5.c | 10 |
5 files changed, 22 insertions, 9 deletions
diff --git a/test/h5test.h b/test/h5test.h index 27d90af..6cb00e5 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -353,6 +353,7 @@ H5TEST_DLLVAR size_t n_tests_passed_g; H5TEST_DLLVAR size_t n_tests_failed_g; H5TEST_DLLVAR size_t n_tests_skipped_g; H5TEST_DLLVAR uint64_t vol_cap_flags_g; +H5TEST_DLLVAR int mpi_rank_framework_g; H5TEST_DLL void h5_send_message(const char *file, const char *arg1, const char *arg2); H5TEST_DLL herr_t h5_wait_message(const char *file); diff --git a/test/testframe.c b/test/testframe.c index ed60520..5973a78 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -49,6 +49,7 @@ static const void *Test_parameters = NULL; static const char *TestProgName = NULL; static void (*TestPrivateUsage)(void) = NULL; static int (*TestPrivateParser)(int ac, char *av[]) = NULL; +int mpi_rank_framework_g = 0; /* * Setup a test function and add it to the list of tests. @@ -303,7 +304,8 @@ PerformTests(void) MESSAGE(2, ("Skipping -- %s (%s) \n", Test[Loop].Description, Test[Loop].Name)); } else { - MESSAGE(2, ("Testing -- %s (%s) \n", Test[Loop].Description, Test[Loop].Name)); + if (mpi_rank_framework_g == 0) + MESSAGE(2, ("Testing -- %s (%s) \n", Test[Loop].Description, Test[Loop].Name)); MESSAGE(5, ("===============================================\n")); Test[Loop].NumErrors = num_errs; Test_parameters = Test[Loop].Parameters; @@ -316,12 +318,14 @@ PerformTests(void) } Test_parameters = NULL; /* clear it. */ - MESSAGE(2, ("\n\n")); - if (num_errs) - print_func("!!! %d Error(s) were detected !!!\n\n", (int)num_errs); - else - print_func("All tests were successful. \n\n"); + if (mpi_rank_framework_g == 0) { + MESSAGE(2, ("\n\n")); + if (num_errs) + print_func("!!! %d Error(s) were detected !!!\n\n", (int)num_errs); + else + print_func("All tests were successful. \n\n"); + } } /* diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index 1edec56..a6e8560 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -4278,6 +4278,8 @@ main(int argc, char **argv) MPI_Comm_size(test_comm, &mpi_size); MPI_Comm_rank(test_comm, &mpi_rank); + mpi_rank_framework_g = mpi_rank; + memset(filenames, 0, sizeof(filenames)); dim0 = BIG_X_FACTOR; diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index d9cd20c..6587190 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -4260,6 +4260,8 @@ main(int argc, char **argv) MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); + mpi_rank_framework_g = mpi_rank; + dim0 = ROW_FACTOR * mpi_size; dim1 = COL_FACTOR * mpi_size; diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index ed0510c..0b94be9 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -234,9 +234,11 @@ parse_options(int argc, char **argv) nerrors++; return (1); } - printf("Test filenames are:\n"); - for (i = 0; i < n; i++) - printf(" %s\n", filenames[i]); + if (mpi_rank == 0) { + printf("Test filenames are:\n"); + for (i = 0; i < n; i++) + printf(" %s\n", filenames[i]); + } } return (0); @@ -314,6 +316,8 @@ main(int argc, char **argv) MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); + mpi_rank_framework_g = mpi_rank; + dim0 = ROW_FACTOR * mpi_size; dim1 = COL_FACTOR * mpi_size; |