From: Nick Bowler <nbowler@draconx.ca>
Date: Tue, 9 Mar 2021 03:06:38 +0000 (-0500)
Subject: Allow testsuite to run configure with alternate shells.
X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/commitdiff_plain/65cd51576af61ad651c5f1546c4ded144017cfa4

Allow testsuite to run configure with alternate shells.

For portability testing of autoconf macros, it is useful to be able
to have the tests run configure with different shells.  Add a global
knob to do this: just run make check with TEST_SHELL=whatever and
the testsuite will set CONFIG_SHELL in testcases appropriately.

Or configure the whole package with CONFIG_SHELL and that will get
passed down too.

However, avoid running the testsuite itself by default with such a
shell because that's not actually what we're trying to test.
---

diff --git a/atlocal.in b/atlocal.in
index 9fd159e..e19cb6a 100644
--- a/atlocal.in
+++ b/atlocal.in
@@ -1,3 +1,4 @@
 : "${AWK=@AWK@}"
 : "${CC=@CC@}"
 : "${EXEEXT=@EXEEXT@}"
+: "${TEST_SHELL=@SHELL@}"
diff --git a/tests/macros.at b/tests/macros.at
index 4c7c8dd..07d23ca 100644
--- a/tests/macros.at
+++ b/tests/macros.at
@@ -132,7 +132,7 @@ AC_CONFIG_FILES([test])
 ]])
 
 TEST_AUTORECONF
-export LINGUAS='en_CA en'; TEST_CONFIGURE
+LINGUAS='en_CA en'; export LINGUAS; TEST_CONFIGURE
 
 AT_CHECK([cat test], [0], [[POFILES = po/en.po
 MOFILES = po/en.mo
@@ -198,43 +198,37 @@ AC_CONFIG_FILES([test])
 ]])
 TEST_AUTORECONF
 
-export LINGUAS="en"; TEST_CONFIGURE
+LINGUAS='en'; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = po/en.mo
 ]])
 
-export LINGUAS="en_US"; TEST_CONFIGURE
+LINGUAS='en_US'; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = po/en.mo po/en_US.mo
 ]])
 
-export LINGUAS="en_CA"; TEST_CONFIGURE
+LINGUAS='en_CA'; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = po/en.mo
 ]])
 
-export LINGUAS="ja ko"; TEST_CONFIGURE
+LINGUAS='ja ko'; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = po/ja.mo
 ]])
 
-export LINGUAS="ja ko"; TEST_CONFIGURE
+LINGUAS='ja_JP ko_KR'; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = po/ja.mo
 ]])
 
-export LINGUAS="ja_JP ko_KR"; TEST_CONFIGURE
-AT_CHECK([cat test], [0],
-[[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
-MOFILES = po/ja.mo
-]])
-
-export LINGUAS=""; TEST_CONFIGURE
+LINGUAS=''; export LINGUAS; TEST_CONFIGURE
 AT_CHECK([cat test], [0],
 [[POFILES = po/en.po po/en_US.po po/ja.po po/zh.po
 MOFILES = @&t@
diff --git a/testsuite.at b/testsuite.at
index 7e5ea5d..f25bb33 100644
--- a/testsuite.at
+++ b/testsuite.at
@@ -25,15 +25,26 @@ AC_OUTPUT
 cp "$srcdir/install-sh" \
    "$srcdir/depcomp" \
    "$srcdir/missing" \
-   "$srcdir/config.guess" \
    "$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 ./configure CONFIG_SHELL=$TEST_SHELL $1],
+[0], [ignore])])
 
 m4_include([tests/macros.at])
 m4_include([tests/snippets.at])