Concentrate all PIO test logic in 'pio_write_run.in' (again).

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

tests/pio_cksum_mpi_fw_at_all.test.in

@@ -3,5 +3,5 @@
 pio_write_args="-p PIO_MPI_FW_AT_ALL -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77

tests/pio_cksum_mpi_fw_at_reblock.test.in

@@ -3,5 +3,5 @@
 pio_write_args="-p PIO_MPI_FW_AT_REBLOCK -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77

tests/pio_cksum_mpi_fw_ordered.test.in

@@ -3,5 +3,5 @@
 pio_write_args="-p PIO_MPI_FW_ORDERED -w 2"
 mpi_task_num=5
 
-. ./pio_write_run_parallel.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

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.test
+. ./pio_write_run
 ( . ./pio_write_dist_array.test ) || test $? -eq 77
 #
 # Local Variables:

tests/pio_write_deco2d_run.in

 #!@SHELL@
-suffix="${suffix-grb}"
+
+suffix=grb
 pio_write=./pio_write_deco2d
 
 . ./pio_write_run

tests/pio_write_deco2d_run_parallel.test.in

 #!@SHELL@
-suffix="${suffix-grb}"
-mpi_task_num="${mpi_task_num-6}"
+
+suffix=grb
+mpi_task_num=6
 pio_write=./pio_write_deco2d_parallel
 
-. ./pio_write_run_parallel.test
+. ./pio_write_run
 #
 # Local Variables:
 # mode: sh

tests/pio_write_dist_array.test.in

 #!@SHELL@
-
-@ENABLE_MPI_FALSE@exit 77
-test 'x@MPI_LAUNCH@' != xtrue || exit 77
 test 'x@HAVE_PPM_DIST_ARRAY@' = xyes || exit 77
 
-prefix=${0##*/}
-suffix=${suffix-grb}
-
-case ${suffix} in
-  grb)
-    test 'x@ENABLE_GRIB@' = xyes || exit 77
-    ;;
-  grb2)
-    @HAVE_LIBGRIB_API_FALSE@exit 77
-    ;;
-  nc|nc2)
-    test 'x@ENABLE_NETCDF@' = xyes || exit 77
-    ;;
-  nc4)
-    test 'x@ENABLE_NETCDF@' = xyes || exit 77
-    test 'x@ENABLE_NC4@' = xyes || exit 77
-    ;;
-  *)
-    echo "Unsupported suffix '${suffix}'" >&2
-    exit 1
-    ;;
-esac
-
 mpi_task_num=${mpi_task_num-4}
+variations="'-qcreate-curvilinear-grid -quse-dist-grid'"
 
-variation='-qcreate-curvilinear-grid -quse-dist-grid'
-
-echo "creating data with ${variation}" >&2
-@top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ \
-  -n ${mpi_task_num} ${tool_wrap} ./pio_write_parallel "-qprefix=${prefix}" -f ${suffix} \
-  ${pio_write_args} -s 7 ${variation} || exit 1
-echo "checking ${prefix}_0.${suffix}" >&2
-@top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
-echo "checking ${prefix}_1.${suffix}" >&2
-@top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
-
+. ./pio_write_run
 #
 # Local Variables:
 # mode: sh

tests/pio_write_run.in

 #!@SHELL@
 
 prefix=${0##*/}
-suffix="${suffix-grb}"
-pio_write=${pio_write-./pio_write}
+suffix=${suffix-grb}
+
+if ${mpi_task_num+:} false; then
+  @ENABLE_MPI_FALSE@exit 77
+  test 'x@MPI_LAUNCH@' != xtrue || exit 77
+  pio_write=${pio_write-'./pio_write_parallel'}
+  variations=${variations-"'' -qno-batch-rma -qcache-redists -qcreate-curvilinear-grid -qpreset-decomposition=true"}
+  launch="@MPI_LAUNCH@ -n ${mpi_task_num} ${tool_wrap_mpi}"
+else
+  pio_write=${pio_write-'./pio_write'}
+  variations=${variations-"'' -qcreate-curvilinear-grid"}
+  launch=${tool_wrap}
+fi
 
 case ${suffix} in
   grb)
@@ -24,14 +35,14 @@ case ${suffix} in
     ;;
 esac
 
-variations='-qcreate-curvilinear-grid'
-
-test_variation()
+test_variation ()
 {
   echo "creating data with $1" >&2
   variation=$1
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ${pio_write} "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
+    ${launch} \
+    ${pio_write} "-qprefix=${prefix}" -f ${suffix} \
+    ${pio_write_args} -s 7 ${variation} || exit 1
   echo "checking ${prefix}_0.${suffix}" >&2
   @top_builddir@/libtool --mode=execute \
     ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
@@ -40,10 +51,10 @@ test_variation()
     ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 }
 
-for variation in "" $variations ; do
+eval "set dummy $variations"; shift
+for variation in "$@"; do
   test_variation "$variation" || exit 1
 done
-
 #
 # Local Variables:
 # mode: sh

tests/pio_write_run_parallel.test.in

 #!@SHELL@
-@ENABLE_MPI_FALSE@exit 77
-test 'x@MPI_LAUNCH@' != xtrue || exit 77
 
-mpi_task_num="${mpi_task_num-4}"
-
-prefix=${0##*/}
-suffix="${suffix-grb}"
-pio_write=${pio_write-./pio_write_parallel}
-
-case ${suffix} in
-  grb)
-    test 'x@ENABLE_GRIB@' = xyes || exit 77
-    ;;
-  grb2)
-    @HAVE_LIBGRIB_API_FALSE@exit 77
-    ;;
-  nc|nc2)
-    test 'x@ENABLE_NETCDF@' = xyes || exit 77
-    ;;
-  nc4)
-    test 'x@ENABLE_NETCDF@' = xyes || exit 77
-    test 'x@ENABLE_NC4@' = xyes || exit 77
-    ;;
-  *)
-    echo "Unsupported suffix '${suffix}'" >&2
-    exit 1
-    ;;
-esac
-
-variations='-qno-batch-rma -qcache-redists -qcreate-curvilinear-grid -qpreset-decomposition=true'
-
-test_variation()
-{
-  echo "creating data with $1" >&2
-  variation=$1
-  @top_builddir@/libtool --mode=execute \
-    @MPI_LAUNCH@ \
-    -n ${mpi_task_num} ${tool_wrap_mpi} \
-    ${pio_write} "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
-  echo "checking ${prefix}_0.${suffix}" >&2
-  @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
-  echo "checking ${prefix}_1.${suffix}" >&2
-  @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
-}
-
-for variation in "" $variations ; do
-  test_variation "$variation"
-done
+mpi_task_num=${mpi_task_num-4}
 
+. ./pio_write_run
 #
 # Local Variables:
 # mode: sh