From 297c8cf72445fd026024b963cd5390f6d7345d3c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 7 Aug 2011 11:22:11 +0200 Subject: [PATCH] testsuite: run TAP and "plain" tests with the same $(LOG_COMPILER) With this change, it will be easier to override, at make time, the shell used to run the tests. * tests/Makefile.am (LOG_COMPILER): Define to `$(SHELL)'. (TEST_LOG_COMPILER): Re-define to `$(LOG_COMPILER)'. (TAP_LOG_COMPILER): Likewise. --- ChangeLog | 9 +++++++++ tests/Makefile.am | 5 +++-- tests/Makefile.in | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 335537beb..d25ec453b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-08-07 Stefano Lattarini + + testsuite: run TAP and "plain" tests with the same $(LOG_COMPILER) + With this change, it will be easier to override, at make time, the + shell used to run the tests. + * tests/Makefile.am (LOG_COMPILER): Define to `$(SHELL)'. + (TEST_LOG_COMPILER): Re-define to `$(LOG_COMPILER)'. + (TAP_LOG_COMPILER): Likewise. + 2011-08-06 Stefano Lattarini testsuite: run TAP-based tests explicitly with $(SHELL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 78f30468b..58916cffa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,8 +33,9 @@ MAINTAINERCLEANFILES = EXTRA_DIST = ChangeLog-old # Run the tests with the shell detected at configure time. -TEST_LOG_COMPILER = $(SHELL) -TAP_LOG_COMPILER = $(SHELL) +LOG_COMPILER = $(SHELL) +TEST_LOG_COMPILER = $(LOG_COMPILER) +TAP_LOG_COMPILER = $(LOG_COMPILER) XFAIL_TESTS = \ all.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 59945956d..ea766f6e5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -301,8 +301,9 @@ EXTRA_DIST = ChangeLog-old gen-parallel-tests parallel-tests.sh \ extract-testsuite-summary tap-setup.sh tap-summary-aux.sh # Run the tests with the shell detected at configure time. -TEST_LOG_COMPILER = $(SHELL) -TAP_LOG_COMPILER = $(SHELL) +LOG_COMPILER = $(SHELL) +TEST_LOG_COMPILER = $(LOG_COMPILER) +TAP_LOG_COMPILER = $(LOG_COMPILER) XFAIL_TESTS = \ all.test \ auxdir2.test \ -- 2.47.2