X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/6fb8cf34b6e66e2b81d53f0d166fd2a6db6b01fb..HEAD:/testsuite.at

diff --git a/testsuite.at b/testsuite.at
index 9c36c2f..66b7869 100644
--- a/testsuite.at
+++ b/testsuite.at
@@ -1,18 +1,19 @@
-AT_COPYRIGHT([dnl
-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.
+AT_COPYRIGHT([Copyright (C) 2015, 2019-2024 Nick Bowler
+License GPLv3+: GNU General Public License version 3 or any later version.
+This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.])
 
+m4_include([snippet/at-compat.at])
+m4_include([snippet/test-tap.at])
+m4_include([snippet/test-nls.at])
+
 AT_INIT
 AT_COLOR_TESTS
 
 m4_divert_push([PREPARE_TESTS])dnl
-{
-  AS_ECHO(["% prove --version"])
-  prove --version </dev/null
-  echo
-} >&AS_MESSAGE_LOG_FD 2>&1
+# Avoid inheriting the user's preference for Automake silent rules from the
+# environment, as this changes make output leading to failed tests.
+AS_UNSET([enable_silent_rules])
 
 # Reduce influence from the toplevel "make" invocation on test cases.
 AS_UNSET([MAKEFLAGS])
@@ -23,6 +24,16 @@ 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
 ]])
@@ -49,7 +60,8 @@ AT_CHECK([autoreconf -I "$srcdir/m4"], [0], [], [stderr])])
 m4_define([TEST_CONFIGURE], [AT_KEYWORDS([configure])dnl
 AT_CHECK([export CC
 CONFIG_SHELL=$TEST_SHELL $TEST_SHELL m4_default([$2],
-[./configure]) --quiet CONFIG_SHELL=$TEST_SHELL $1])])
+[./configure]) --quiet CONFIG_SHELL="$TEST_SHELL" \
+  at_srcdir="$srcdir" AWK="$AWK" $1])])
 
 m4_include([tests/macros.at])
 m4_include([tests/snippets.at])