X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/f14190dbcda7e9cf94e1691163081b98ecd2f3b1..54f9ce81ef444d6e869f7b32066928ed82c17dff:/testsuite.at

diff --git a/testsuite.at b/testsuite.at
index 7e5ea5d..badb6de 100644
--- a/testsuite.at
+++ b/testsuite.at
@@ -1,5 +1,5 @@
 AT_COPYRIGHT([dnl
-Copyright © 2015,2019-2021 Nick Bowler
+Copyright © 2015,2019-2023 Nick Bowler
 License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 This is free software: you are free to do what the fuck you want to.
 There is NO WARRANTY, to the extent permitted by law.])
@@ -7,9 +7,13 @@ There is NO WARRANTY, to the extent permitted by law.])
 AT_INIT
 AT_COLOR_TESTS
 
-AT_TESTED([prove])
-
 m4_divert_push([PREPARE_TESTS])dnl
+{
+  AS_ECHO(["% prove --version"])
+  prove --version </dev/null
+  echo
+} >&AS_MESSAGE_LOG_FD 2>&1
+
 # Reduce influence from the toplevel "make" invocation on test cases.
 AS_UNSET([MAKEFLAGS])
 AS_UNSET([MAKELEVEL])
@@ -19,21 +23,44 @@ m4_divert_pop([PREPARE_TESTS])
 m4_define([TEST_CONFIGURE_AC], [AT_KEYWORDS([autoconf m4])dnl
 AT_DATA([configure.ac],
 [[AC_INIT([test], [0])
+
+# Install t/bork into the path, which contains a non-functional
+# dummy "awk" command to catch direct "awk" usage (as opposed to
+# using AC_PROG_AWK and $AWK).  Then work around direct awk usage
+# in LT_INIT to avoid the dummy.
+test_orig_PATH=$PATH
+PATH=$at_srcdir/t/bork:$PATH
+m4@&t@_ifdef([LT_INIT], [m4@&t@_define([LT_INIT],
+[m4@&t@_pushdef([awk], [$AWK])]m4@&t@_defn([LT_INIT])[m4@&t@_popdef([awk])])])
+
 ]$1[
 AC_OUTPUT
 ]])
 cp "$srcdir/install-sh" \
    "$srcdir/depcomp" \
    "$srcdir/missing" \
-   "$srcdir/config.guess" \
+   "$srcdir/compile" \
    "$srcdir/config.sub" \
    .
+# Simplified config.guess script avoids some spurious testcase failures
+# when using heirloom-sh on GNU/Linux.
+config_guess=`"$srcdir/config.guess"`
+cat >config.guess <<EOF
+#!/bin/sh
+cat <<'GUESS_EOF'
+$config_guess
+GUESS_EOF
+EOF
+chmod +x config.guess
 ])
 m4_define([TEST_AUTORECONF], [AT_KEYWORDS([autoconf])dnl
 AT_CHECK([autoreconf -I "$srcdir/m4"], [0], [], [stderr])])
 
 m4_define([TEST_CONFIGURE], [AT_KEYWORDS([configure])dnl
-AT_CHECK([export CC; ./configure $1], [0], [ignore])])
+AT_CHECK([export CC
+CONFIG_SHELL=$TEST_SHELL $TEST_SHELL m4_default([$2],
+[./configure]) --quiet CONFIG_SHELL="$TEST_SHELL" \
+  at_srcdir="$srcdir" AWK="$AWK" $1])])
 
 m4_include([tests/macros.at])
 m4_include([tests/snippets.at])