Make 'test_cksum_base' responsible for skipping tests.

.gitignore

@@ -34,6 +34,7 @@ Makefile.in
 /src/stamp-h1
 /tables/gen_tableheaderfile
 /tests/*.run
+/tests/test_cksum_base
 Makefile
 
 # Build stage files:

configure.ac

@@ -667,6 +667,7 @@ AC_CONFIG_FILES([
   src/pkgconfig/cdi_f2003.pc
   src/pkgconfig/cdipio.pc
   tests/Makefile
+  tests/test_cksum_base
 ])
 AC_CONFIG_FILES([
   tables/gen_tableheaderfile
@@ -689,15 +690,15 @@ AC_CONFIG_FILES([
   tests/test_byteswap.run
   tests/test_cdf_const.run
   tests/test_cdf_transformation.run
-  tests/test_cksum_extra.run
-  tests/test_cksum_grib.run
-  tests/test_cksum_grib2.run
+  tests/test_cksum_ext.run
+  tests/test_cksum_grb.run
+  tests/test_cksum_grb2.run
   tests/test_cksum_ieg.run
   tests/test_cksum_nc.run
   tests/test_cksum_nc2.run
   tests/test_cksum_nc4.run
   tests/test_cksum_nc_chunk.run
-  tests/test_cksum_service.run
+  tests/test_cksum_srv.run
   tests/test_f2003.run
   tests/test_grib.run
   tests/test_resource_copy.parallel.run

tests/Makefile.am

@@ -9,21 +9,33 @@ TESTS = \
   test_byteswap.run \
   test_cdf_const.run \
   test_cdf_transformation.run \
-  test_cksum_extra.run \
-  test_cksum_grib.run \
-  test_cksum_grib2.run \
+  test_cksum_ext.run \
+  test_cksum_grb.run \
+  test_cksum_grb2.run \
   test_cksum_ieg.run \
   test_cksum_nc.run \
   test_cksum_nc2.run \
   test_cksum_nc4.run \
   test_cksum_nc_chunk.run \
-  test_cksum_service.run \
+  test_cksum_srv.run \
   test_f2003.run \
   test_grib.run \
   test_month_adjust \
   test_resource_copy.run \
   test_table.run
 
+# Update test_cksum_base before running tests that source it:
+test_cksum_TEST_LOGS_ = \
+  test_cksum_ext.log \
+  test_cksum_grb.log \
+  test_cksum_grb2.log \
+  test_cksum_ieg.log \
+  test_cksum_nc.log \
+  test_cksum_nc2.log \
+  test_cksum_nc4.log \
+  test_cksum_srv.log
+$(test_cksum_TEST_LOGS_): test_cksum_base
+
 # Parallel tests:
 TESTS += \
   pio_cksum_asynch.run \
@@ -182,8 +194,6 @@ clean-local:
 
 AUTOMAKE_OPTIONS = color-tests
 
-EXTRA_DIST = test_cksum_base
-
 # Compile programs using Libtool:
 COMPILE = $(LTCOMPILE)
 FCCOMPILE = $(LTFCCOMPILE)

tests/test_cksum_base

-#! /bin/sh
-# this file is meant to be included for the supported file formats
-
-exec >test_cksum_$format.log 2>&1
-../libtool --mode=execute ${tool_wrap} ./cksum_write -b ${prefix} -f ${format} || exit 1
-../libtool --mode=execute ${tool_wrap} ./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1
-
-#
-# Local Variables:
-# mode: sh
-# End:
-#

tests/test_cksum_base.in

+# This file is meant to be included for the supported file formats.
+
+prefix=${0##*/}
+suffix=${suffix-grb}
+
+case ${suffix} in
+  grb)
+    test 'x@ENABLE_GRIB@' = xyes || exit 77
+    ;;
+  grb2)
+    @HAVE_LIBGRIB_API_FALSE@exit 77
+    test 'x@ENABLE_GRIB@' = xyes || exit 77
+    ;;
+  nc)
+    @ENABLE_NETCDF_FALSE@exit 77
+    ;;
+  nc2)
+    test 'x@ENABLE_NC2@' = xyes || exit 77
+    ;;
+  nc4)
+    test 'x@ENABLE_NC4@' = xyes || exit 77
+    ;;
+  srv)
+    test 'x@ENABLE_SERVICE@' = xyes || exit 77
+    ;;
+  ext)
+    test 'x@ENABLE_EXTRA@' = xyes || exit 77
+    ;;
+  ieg)
+    test 'x@ENABLE_IEG@' = xyes || exit 77
+    ;;
+  *)
+    echo "Unsupported suffix '${suffix}'" >&2
+    exit 1
+    ;;
+esac
+
+../libtool --mode=execute ${tool_wrap} ./cksum_write -b "${prefix}" -f ${suffix} || exit 1
+../libtool --mode=execute ${tool_wrap} ./cksum_read "${prefix}.${suffix}" "${prefix}.cksum" || exit 1
+
+#
+# Local Variables:
+# mode: sh
+# End:
+#

tests/test_cksum_ext.run.in

+#!@SHELL@
+suffix=ext
+. ./test_cksum_base

tests/test_cksum_extra.run.in

-#!@SHELL@
-test 'x@ENABLE_EXTRA@' = xyes || exit 77
-
-prefix=${0##*/}
-format=ext
-. @srcdir@/test_cksum_base

tests/test_cksum_grib.run.in → tests/test_cksum_grb.run.in

 #!@SHELL@
-test 'x@ENABLE_GRIB@' = xyes || exit 77
-
-prefix=${0##*/}
-format=grb
-. @srcdir@/test_cksum_base
+suffix=grb
+. ./test_cksum_base
 
 #
 # Local Variables:

tests/test_cksum_grb2.run.in

+#!@SHELL@
+suffix=grb2
+. ./test_cksum_base

tests/test_cksum_grib2.run.in

-#!@SHELL@
-@HAVE_LIBGRIB_API_FALSE@exit 77
-test 'x@ENABLE_GRIB@' = xyes || exit 77
-
-prefix=${0##*/}
-format=grb2
-./cksum_write -b ${prefix} -f ${format} || exit 1
-./cksum_read ${prefix}.${format} ${prefix}.cksum || exit 1

tests/test_cksum_ieg.run.in

 #!@SHELL@
-test 'x@ENABLE_IEG@' = xyes || exit 77
-
-prefix=${0##*/}
-format=ieg
-. @srcdir@/test_cksum_base
+suffix=ieg
+. ./test_cksum_base

tests/test_cksum_nc.run.in

 #!@SHELL@
-@ENABLE_NETCDF_FALSE@exit 77
-
-prefix=${0##*/}
-format=nc
-. @srcdir@/test_cksum_base
+suffix=nc
+. ./test_cksum_base

tests/test_cksum_nc2.run.in

 #!@SHELL@
-test 'x@ENABLE_NC2@' = xyes || exit 77
-
-prefix=${0##*/}
-format=nc2
-. @srcdir@/test_cksum_base
+suffix=nc2
+. ./test_cksum_base

tests/test_cksum_nc4.run.in

 #!@SHELL@
-test 'x@ENABLE_NC4@' = xyes || exit 77
-
-prefix=${0##*/}
-format=nc4
-. @srcdir@/test_cksum_base
+suffix=nc4
+. ./test_cksum_base

tests/test_cksum_service.run.in

-#!@SHELL@
-test 'x@ENABLE_SERVICE@' = xyes || exit 77
-
-prefix=${0##*/}
-format=srv
-. @srcdir@/test_cksum_base

tests/test_cksum_srv.run.in

+#!@SHELL@
+suffix=srv
+. ./test_cksum_base