summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannick <thirdedition@gmx.net>2020-12-07 11:28:57 -0500
committerZack Weinberg <zackw@panix.com>2020-12-07 11:28:57 -0500
commitfbd2636f3db4578f3ccab42728feee57b1f8c5e2 (patch)
tree73e06e67143d119be6918fc871547ae106c35a0c
parent131d8c69f31dc6fc8dc93abe1096d52d1fe19fd3 (diff)
downloadautoconf-fbd2636f3db4578f3ccab42728feee57b1f8c5e2.tar.gz
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.
-rw-r--r--tests/atlocal.in5
-rw-r--r--tests/local.mk5
2 files changed, 8 insertions, 2 deletions
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)