X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/fbe1276f79d2c12aef279562eed9975e5b74db85..62bc7469bf3ef88c4f81ddf615aa7dabe9ddbf74:/testsuite.at

diff --git a/testsuite.at b/testsuite.at
index 2c08518..a74969f 100644
--- a/testsuite.at
+++ b/testsuite.at
@@ -1,5 +1,5 @@
 AT_COPYRIGHT([dnl
-Copyright © 2015,2019-2021 Nick Bowler
+Copyright © 2015,2019-2022 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.])
@@ -9,6 +9,13 @@ AT_COLOR_TESTS
 
 AT_TESTED([prove])
 
+m4_divert_push([PREPARE_TESTS])dnl
+# Reduce influence from the toplevel "make" invocation on test cases.
+AS_UNSET([MAKEFLAGS])
+AS_UNSET([MAKELEVEL])
+AS_UNSET([MFLAGS])
+m4_divert_pop([PREPARE_TESTS])
+
 m4_define([TEST_CONFIGURE_AC], [AT_KEYWORDS([autoconf m4])dnl
 AT_DATA([configure.ac],
 [[AC_INIT([test], [0])
@@ -16,17 +23,32 @@ AT_DATA([configure.ac],
 AC_OUTPUT
 ]])
 cp "$srcdir/install-sh" \
-   "$srcdir/config.guess" \
+   "$srcdir/depcomp" \
+   "$srcdir/missing" \
+   "$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 $1])])
 
 m4_include([tests/macros.at])
+m4_include([tests/snippets.at])
 m4_include([tests/functions.at])
 m4_include([tests/programs.at])
 m4_include([tests/libs.at])