Optionally (and by default) run MPI tests one by one.

.gitignore

@@ -33,20 +33,20 @@ Makefile.in
 /src/pkgconfig/*.pc
 /src/stamp-h1
 /tables/gen_tableheaderfile
-/tests/pio_cksum_asynch
-/tests/pio_cksum_fpguard
-/tests/pio_cksum_grb2
-/tests/pio_cksum_mpi_fw_at_all
-/tests/pio_cksum_mpi_fw_at_reblock
-/tests/pio_cksum_mpi_fw_ordered
-/tests/pio_cksum_mpinonb
-/tests/pio_cksum_nc
-/tests/pio_cksum_nc2
-/tests/pio_cksum_nc4
-/tests/pio_cksum_writer
-/tests/pio_write_deco2d_run_parallel
+/tests/pio_cksum_asynch.test
+/tests/pio_cksum_fpguard.test
+/tests/pio_cksum_grb2.test
+/tests/pio_cksum_mpi_fw_at_all.test
+/tests/pio_cksum_mpi_fw_at_reblock.test
+/tests/pio_cksum_mpi_fw_ordered.test
+/tests/pio_cksum_mpinonb.test
+/tests/pio_cksum_nc.test
+/tests/pio_cksum_nc2.test
+/tests/pio_cksum_nc4.test
+/tests/pio_cksum_writer.test
+/tests/pio_write_deco2d_run_parallel.test
 /tests/pio_write_deco2d_run_serial
-/tests/pio_write_run_parallel
+/tests/pio_write_run_parallel.test
 /tests/pio_write_run_serial
 /tests/test_byteswap_run
 /tests/test_cdf_const
@@ -61,7 +61,7 @@ Makefile.in
 /tests/test_cksum_nc_chunk
 /tests/test_cksum_service
 /tests/test_f2003
-/tests/test_resource_copy_mpi_run
+/tests/test_resource_copy_mpi_run.test
 /tests/test_resource_copy_run
 /tests/test_table_run
 Makefile

configure.ac

@@ -611,6 +611,15 @@ AM_MISSING_PROG([PYTHON], [python])
 AM_CONDITIONAL([ENABLE_PYTHON_INTERFACE],
   [test "x$enable_python_interface" = xyes])
 
+AC_ARG_WITH([concurrent-mpi-checks],
+  [AS_HELP_STRING([--with-concurrent-mpi-checks],
+     [allow for simultaneous runs of MPI tests @<:@default: run MPI test ]dnl
+[programs one after another@:>@])],
+  [test "x$withval" != xno && with_concurrent_mpi_checks=yes],
+  [with_concurrent_mpi_checks=no])
+AM_CONDITIONAL([with_concurrent_mpi_checks],
+  [test "x$with_concurrent_mpi_checks" = xyes])
+
 m4_foreach([build_flag_var],[[BUILD_CFLAGS],[BUILD_FCFLAGS],[BUILD_LDFLAGS],[BUILD_LIBS],[BUILD_MPI_C_LIB],[BUILD_MPI_FC_LIB],[BUILD_C_INCLUDE],[BUILD_FC_INCLUDE]],
   [AC_ARG_VAR(build_flag_var,
      [append to ]m4_bpatsubst(build_flag_var, [BUILD_], [])[ during build but not in configure phase])dnl
@@ -651,20 +660,20 @@ AC_CONFIG_FILES([
 ])
 AC_CONFIG_FILES([
   tables/gen_tableheaderfile
-  tests/pio_cksum_asynch
-  tests/pio_cksum_fpguard
-  tests/pio_cksum_grb2
-  tests/pio_cksum_mpi_fw_at_all
-  tests/pio_cksum_mpi_fw_at_reblock
-  tests/pio_cksum_mpi_fw_ordered
-  tests/pio_cksum_mpinonb
-  tests/pio_cksum_nc
-  tests/pio_cksum_nc2
-  tests/pio_cksum_nc4
-  tests/pio_cksum_writer
-  tests/pio_write_deco2d_run_parallel
+  tests/pio_cksum_asynch.test
+  tests/pio_cksum_fpguard.test
+  tests/pio_cksum_grb2.test
+  tests/pio_cksum_mpi_fw_at_all.test
+  tests/pio_cksum_mpi_fw_at_reblock.test
+  tests/pio_cksum_mpi_fw_ordered.test
+  tests/pio_cksum_mpinonb.test
+  tests/pio_cksum_nc.test
+  tests/pio_cksum_nc2.test
+  tests/pio_cksum_nc4.test
+  tests/pio_cksum_writer.test
+  tests/pio_write_deco2d_run_parallel.test
   tests/pio_write_deco2d_run_serial
-  tests/pio_write_run_parallel
+  tests/pio_write_run_parallel.test
   tests/pio_write_run_serial
   tests/test_byteswap_run
   tests/test_cdf_const
@@ -679,7 +688,7 @@ AC_CONFIG_FILES([
   tests/test_cksum_nc_chunk
   tests/test_cksum_service
   tests/test_f2003
-  tests/test_resource_copy_mpi_run
+  tests/test_resource_copy_mpi_run.test
   tests/test_resource_copy_run
   tests/test_table_run
 ],

tests/Makefile.am

 TESTS = \
   calendar_test1 \
   cksum_verify \
-  pio_cksum_asynch \
-  pio_cksum_fpguard \
-  pio_cksum_grb2 \
-  pio_cksum_mpi_fw_at_all \
-  pio_cksum_mpi_fw_at_reblock \
-  pio_cksum_mpi_fw_ordered \
-  pio_cksum_mpinonb \
-  pio_cksum_nc \
-  pio_cksum_nc2 \
-  pio_cksum_nc4 \
-  pio_cksum_writer \
-  pio_write_deco2d_run_parallel \
   pio_write_deco2d_run_serial \
-  pio_write_run_parallel \
   pio_write_run_serial \
   test_byteswap_run \
   test_cdf_const \
@@ -30,10 +17,42 @@ TESTS = \
   test_cksum_service \
   test_f2003 \
   test_month_adjust \
-  test_resource_copy_mpi_run \
   test_resource_copy_run \
   test_table_run
 
+# MPI test must have prefix *.test:
+TESTS += \
+  pio_cksum_asynch.test \
+  pio_cksum_fpguard.test \
+  pio_cksum_grb2.test \
+  pio_cksum_mpi_fw_at_all.test \
+  pio_cksum_mpi_fw_at_reblock.test \
+  pio_cksum_mpi_fw_ordered.test \
+  pio_cksum_mpinonb.test \
+  pio_cksum_nc.test \
+  pio_cksum_nc2.test \
+  pio_cksum_nc4.test \
+  pio_cksum_writer.test \
+  pio_write_deco2d_run_parallel.test \
+  pio_write_run_parallel.test \
+  test_resource_copy_mpi_run.test
+
+if !with_concurrent_mpi_checks
+pio_cksum_fpguard.log: pio_cksum_asynch.log
+pio_cksum_grb2.log: pio_cksum_fpguard.log
+pio_cksum_mpi_fw_at_all.log: pio_cksum_grb2.log
+pio_cksum_mpi_fw_at_reblock.log: pio_cksum_mpi_fw_at_all.log
+pio_cksum_mpi_fw_ordered.log: pio_cksum_mpi_fw_at_reblock.log
+pio_cksum_mpinonb.log: pio_cksum_mpi_fw_ordered.log
+pio_cksum_nc.log: pio_cksum_mpinonb.log
+pio_cksum_nc2.log: pio_cksum_nc.log
+pio_cksum_nc4.log: pio_cksum_nc2.log
+pio_cksum_writer.log: pio_cksum_nc4.log
+pio_write_deco2d_run_parallel.log: pio_cksum_writer.log
+pio_write_run_parallel.log: pio_write_deco2d_run_parallel.log
+test_resource_copy_mpi_run.log: pio_write_run_parallel.log
+endif !with_concurrent_mpi_checks
+
 check_PROGRAMS = \
   calendar_test1 \
   cksum_read \

tests/pio_cksum_asynch.in → tests/pio_cksum_asynch.test.in

@@ -3,7 +3,7 @@
 pio_write_args="-p PIO_ASYNCH -w 3"
 mpi_task_num=7
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_fpguard.in → tests/pio_cksum_fpguard.test.in

@@ -3,7 +3,7 @@
 pio_write_args="-p PIO_FPGUARD -w 3"
 mpi_task_num=6
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_grb2.in → tests/pio_cksum_grb2.test.in

@@ -4,7 +4,7 @@ pio_write_args="-w 3"
 mpi_task_num=8
 suffix=grb2
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_mpi_fw_at_all.in → tests/pio_cksum_mpi_fw_at_all.test.in

@@ -3,4 +3,4 @@
 pio_write_args="-p PIO_MPI_FW_AT_ALL -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test

tests/pio_cksum_mpi_fw_at_reblock.in → tests/pio_cksum_mpi_fw_at_reblock.test.in

@@ -3,4 +3,4 @@
 pio_write_args="-p PIO_MPI_FW_AT_REBLOCK -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test

tests/pio_cksum_mpi_fw_ordered.in → tests/pio_cksum_mpi_fw_ordered.test.in

@@ -3,4 +3,4 @@
 pio_write_args="-p PIO_MPI_FW_ORDERED -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test

tests/pio_cksum_mpinonb.in → tests/pio_cksum_mpinonb.test.in

@@ -3,7 +3,7 @@
 pio_write_args="-p PIO_MPI -w 2"
 mpi_task_num=4
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_nc.in → tests/pio_cksum_nc.test.in

@@ -4,7 +4,7 @@ suffix=nc
 pio_write_args="-w 2 -qtaxis-type=relative"
 mpi_task_num=5
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_nc2.in → tests/pio_cksum_nc2.test.in

@@ -4,7 +4,7 @@ suffix=nc2
 pio_write_args="-w 3 -qtaxis-type=relative"
 mpi_task_num=8
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_nc4.in → tests/pio_cksum_nc4.test.in

@@ -4,7 +4,7 @@ suffix=nc4
 pio_write_args="-w 3 -qtaxis-type=relative"
 mpi_task_num=7
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh

tests/pio_cksum_writer.in → tests/pio_cksum_writer.test.in

@@ -4,7 +4,7 @@ test 'x@ENABLE_GRIB@' = xyes || exit 77
 pio_write_args="-p PIO_WRITER -w 4"
 mpi_task_num=8
 
-. ./pio_write_run_parallel
+. ./pio_write_run_parallel.test
 #
 # Local Variables:
 # mode: sh