Switch to the parallel test harness.

.gitignore

@@ -11,6 +11,7 @@
 /config/install-sh
 /config/ltmain.sh
 /config/missing
+/config/test-driver
 /configure
 /m4/libtool.m4
 /m4/ltoptions.m4
@@ -127,6 +128,7 @@ Makefile
 /tests/*.stderr
 /tests/*.stdout
 /tests/*.svc
+/tests/*.trs
 
 # Dist stage files:
 /cdi-*.tar.gz

configure.ac

@@ -17,7 +17,7 @@ m4_pattern_forbid([^ACX_])
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
-AM_INIT_AUTOMAKE([foreign serial-tests])
+AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC_C99

tests/Makefile.am

@@ -129,7 +129,7 @@ test_cdf_write_SOURCES = \
 test_resource_copy_mpi_SOURCES = test_resource_copy_mpi.c
 
 clean-local:
-	-rm -f *.cksum *.ext *.grb *.grb2 *.ieg *.nc *.nc2 *.nc4 *.stderr *.stdout *.svc *.log
+	-rm -f *.cksum *.ext *.grb *.grb2 *.ieg *.nc *.nc2 *.nc4 *.stderr *.stdout *.svc
 	-rm -rf *.dSYM
 
 AUTOMAKE_OPTIONS = color-tests

tests/pio_cksum_asynch.in

@@ -3,7 +3,6 @@
 
 pio_write_args="-p PIO_ASYNCH -w 3"
 mpi_task_num=7
-LOG=pio_cksum_asynch.log
 
 . ./pio_write_run
 #

tests/pio_cksum_cdf.in

 #!@SHELL@
 @ENABLE_MPI_FALSE@exit 77
 
-LOG=pio_cksum_cdf.log
-
 suffix=nc4
 mpi_task_num=7
 pio_write_args="-w 3 -qtaxis-type=relative"

tests/pio_cksum_fpguard.in

@@ -3,7 +3,6 @@
 
 pio_write_args="-p PIO_FPGUARD -w 3"
 mpi_task_num=6
-LOG=pio_cksum_fpguard.log
 
 . ./pio_write_run
 #

tests/pio_cksum_grb2.in

@@ -3,7 +3,6 @@
 
 pio_write_args="-w 3"
 mpi_task_num=8
-LOG=pio_cksum_grb2.log
 suffix=grb2
 
 . ./pio_write_run

tests/pio_cksum_mpi_fw_at_all.in

@@ -3,6 +3,5 @@
 
 pio_write_args="-p PIO_MPI_FW_AT_ALL -w 2"
 mpi_task_num=5
-LOG=pio_cksum_mpi_fw_at_all.log
 
 . ./pio_write_run

tests/pio_cksum_mpi_fw_at_reblock.in

@@ -3,6 +3,5 @@
 
 pio_write_args="-p PIO_MPI_FW_AT_REBLOCK -w 2"
 mpi_task_num=5
-LOG=pio_cksum_mpi_fw_at_reblock.log
 
 . ./pio_write_run

tests/pio_cksum_mpi_fw_ordered.in

@@ -3,6 +3,5 @@
 
 pio_write_args="-p PIO_MPI_FW_ORDERED -w 2"
 mpi_task_num=5
-LOG=pio_cksum_mpi_fw_ordered.log
 
 . ./pio_write_run

tests/pio_cksum_mpinonb.in

@@ -3,7 +3,6 @@
 
 pio_write_args="-p PIO_MPI -w 2"
 mpi_task_num=4
-LOG=pio_cksum_mpinonb.log
 
 . ./pio_write_run
 #

tests/pio_cksum_writer.in

@@ -4,7 +4,6 @@ test 'x@ENABLE_GRIB@' = xyes || exit 77
 
 pio_write_args="-p PIO_WRITER -w 4"
 mpi_task_num=8
-LOG=pio_cksum_writer.log
 
 . ./pio_write_run
 #

tests/pio_write_deco2d_run.in

 #!@SHELL@
 test 'x@MPI_LAUNCH@' != xtrue || exit 77
 
-LOG="${LOG-pio_write_deco2d.log}"
 mpi_task_num="${mpi_task_num-6}"
+
+prefix=${0##*/}
 suffix="${suffix-grb}"
 
 case ${suffix} in
@@ -25,14 +26,12 @@ case ${suffix} in
     ;;
 esac
 
-exec 5>&1 6>&2 >"$LOG" 2>&1
 @top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
-  ${tool_wrap} ./pio_write_deco2d -f ${suffix} ${pio_write_args} || exit 1
-exec 2>&6 1>&5 5>&- 6>&-
+  ${tool_wrap} ./pio_write_deco2d -b ${prefix} -f ${suffix} ${pio_write_args} || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read example_0.${suffix} example_0.cksum || exit 1
+  ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read example_1.${suffix} example_1.cksum || exit 1
+  ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
 #
 # Local Variables:
 # mode: sh

tests/pio_write_run.in

 #!@SHELL@
 test 'x@MPI_LAUNCH@' != xtrue || exit 77
 
-LOG=${LOG-pio_write.log}
 mpi_task_num="${mpi_task_num-4}"
+
+prefix=${0##*/}
 suffix="${suffix-grb}"
 
 case ${suffix} in
@@ -30,21 +31,19 @@ esac
 
 test_variation()
 {
-  exec 5>&1 6>&2 >"$LOG" 2>&1
   echo "creating data with $1" >&2
   variation=$1
   @top_builddir@/libtool --mode=execute \
     @MPI_LAUNCH@ \
-    -n ${mpi_task_num} ${tool_wrap} ./pio_write -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
-  echo "checking example_0.$suffix" >&2
+    -n ${mpi_task_num} ${tool_wrap} ./pio_write -b ${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 example_0.${suffix} example_0.cksum || exit 1
-  echo "checking example_1.$suffix" >&2
+    ${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 example_1.${suffix} example_1.cksum || exit 1
+    ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
 }
 
-exec 5>&1 6>&2 >"$LOG" 2>&1
 for variation in "" $variations ; do
   test_variation "$variation"
 done
@@ -53,7 +52,6 @@ if test 'x@HAVE_PPM_DIST_ARRAY@' = xyes; then
   test_variation "-qcreate-curvilinear-grid -quse-dist-grid"
 fi
 
-exec 2>&6 1>&5 5>&- 6>&-
 #
 # Local Variables:
 # mode: sh

tests/test_cdf_const.in

@@ -4,13 +4,10 @@ test 'x@ENABLE_NETCDF@' = xyes || exit 77
 cdi_app_stdout="$0.cdi_app.stdout"
 cdi_app_stderr="$0.cdi_app.stderr"
 
-exec >test_cdf_const.log 2>&1
-
 @top_builddir@/examples/cdi_write_const || exit 1
 @top_builddir@/app/cdi -s example_const.nc >${cdi_app_stdout} 2>${cdi_app_stderr} || exit 1
 @top_builddir@/app/cdi example_const.nc >>${cdi_app_stdout} 2>>${cdi_app_stderr} || exit 1
 
-echo "$0"
 exec 6<${cdi_app_stdout} 7<"$0"
 
 while read pattern <&7 ; do

tests/test_chunk_cksum.in

 #!@SHELL@
 test 'x@ENABLE_NETCDF@' = xyes || exit 77
 
+prefix=${0##*/}
 format=nc
-exec >test_chunk_cksum_$format.log 2>&1
-./cksum_write_chunk -m 17 || exit 1
-./cksum_read example.$format || exit 1
+./cksum_write_chunk -b ${prefix} -m 17 || exit 1
+./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1

tests/test_cksum_extra.in

 #!@SHELL@
 test 'x@ENABLE_EXTRA@' = xyes || exit 77
 
+prefix=${0##*/}
 format=ext
-exec >test_cksum_$format.log 2>&1
-./cksum_write -f $format || exit 1
-./cksum_read example.$format || exit 1
+./cksum_write -b ${prefix} -f ${format} || exit 1
+./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1

tests/test_cksum_grib.in

 #!@SHELL@
 test 'x@ENABLE_GRIB@' = xyes || exit 77
 
+prefix=${0##*/}
 format=grb
-exec >test_cksum_$format.log 2>&1
-./cksum_write -f $format || exit 1
-./cksum_read example.$format || exit 1
+./cksum_write -b ${prefix} -f ${format} || exit 1
+./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1

tests/test_cksum_grib2.in

 #!@SHELL@
 @HAVE_LIBGRIB_API_FALSE@exit 77
 
+prefix=${0##*/}
 format=grb2
-exec >test_cksum_$format.log 2>&1
-./cksum_write -f $format || exit 1
-./cksum_read example.$format || exit 1
+./cksum_write -b ${prefix} -f ${format} || exit 1
+./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1

tests/test_cksum_ieg.in

 #!@SHELL@
 test 'x@ENABLE_IEG@' = xyes || exit 77
 
+prefix=${0##*/}
 format=ieg
-exec >test_cksum_$format.log 2>&1
-./cksum_write -f $format || exit 1
-./cksum_read example.$format || exit 1
+./cksum_write -b ${prefix} -f ${format} || exit 1
+./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1