From: Jannick <thirdedition@gmx.net>
Date: Mon, 7 Dec 2020 16:28:57 +0000 (-0500)
Subject: Small bug fixes for the test suite.
X-Git-Tag: v2.70~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbd2636f3db4578f3ccab42728feee57b1f8c5e2;p=thirdparty%2Fautoconf.git

Small bug fixes for the test suite.

* tests/atlocal.in: Also set AWK to value detected by configure.
  Alphabetize list of shell variables set by config.status.
* tests/local.mk: Add a rule to recreate tests/atconfig when
  config.status changes.
---

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 079e35c6..3c436cd9 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -18,9 +18,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-PERL='@PERL@'
-GREP='@GREP@'
+AWK='@AWK@'
 EGREP='@EGREP@'
+GREP='@GREP@'
+PERL='@PERL@'
 SED='@SED@'
 
 # We need to know if sh -n is ok.
diff --git a/tests/local.mk b/tests/local.mk
index f712b531..df5551ba 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -160,6 +160,11 @@ clean-local:
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 	+$(run_testsuite) $(TESTSUITEFLAGS)
 
+# Automake doesn't know how to regenerate this file because
+# it's created via AC_CONFIG_COMMANDS.
+tests/atconfig: $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
 # Run the test suite on the *installed* tree.
 installcheck-local: tests/atconfig tests/atlocal $(TESTSUITE)
 	+$(run_testsuite) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)