[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI 2/7] {tap-test-protocols} testsuite: run autogenerated tests with $
From: |
Stefano Lattarini |
Subject: |
[FYI 2/7] {tap-test-protocols} testsuite: run autogenerated tests with $(LOG_COMPILER) too |
Date: |
Sun, 7 Aug 2011 16:05:33 +0200 |
This change enhances consistency in the testsuite.
* tests/Makefile.am: Some cosmetic reordering, to keep the
definition of FOO_LOG_COMPILER near to the place where `.foo'
is added to $(TEST_EXTENSIONS).
(PTEST_LOG_COMPILER): Run `$(srcdir)/parallel-tests.sh' with
`$(LOG_COMPILER)', not with `$(SHELL)'.
(SHTST_LOG_COMPILER): Likewise.
---
ChangeLog | 11 +++++++++++
tests/Makefile.am | 15 ++++++++-------
tests/Makefile.in | 14 +++++++-------
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d25ec45..0776f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2011-08-07 Stefano Lattarini <address@hidden>
+ testsuite: run autogenerated tests with $(LOG_COMPILER) too
+ This change enhances consistency in the testsuite.
+ * tests/Makefile.am: Some cosmetic reordering, to keep the
+ definition of FOO_LOG_COMPILER near to the place where `.foo'
+ is added to $(TEST_EXTENSIONS).
+ (PTEST_LOG_COMPILER): Run `$(srcdir)/parallel-tests.sh' with
+ `$(LOG_COMPILER)', not with `$(SHELL)'.
+ (SHTST_LOG_COMPILER): Likewise.
+
+2011-08-07 Stefano Lattarini <address@hidden>
+
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.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58916cf..2369c90 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Run the tests with the shell detected at configure time.
+LOG_COMPILER = $(SHELL)
+
TEST_EXTENSIONS = .test .tap
+TEST_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+
TAP_LOG_DRIVER = $(PERL) $(top_srcdir)/lib/tap-driver
TAP_LOG_DRIVER_FLAGS = --merge --comments
## Avoid spurious TAP diagnostic. We use an awful indirection with a
@@ -32,11 +38,6 @@ TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf
'\043%%\043\n'`
MAINTAINERCLEANFILES =
EXTRA_DIST = ChangeLog-old
-# Run the tests with the shell detected at configure time.
-LOG_COMPILER = $(SHELL)
-TEST_LOG_COMPILER = $(LOG_COMPILER)
-TAP_LOG_COMPILER = $(LOG_COMPILER)
-
XFAIL_TESTS = \
all.test \
auxdir2.test \
@@ -58,7 +59,7 @@ $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
EXTRA_DIST += gen-parallel-tests
TEST_EXTENSIONS += .ptest
-PTEST_LOG_COMPILER = $(SHELL) $(srcdir)/parallel-tests.sh
+PTEST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/parallel-tests.sh
EXTRA_DIST += parallel-tests.sh
# All `*-p.ptest' tests work by sourcing the script `parallel-tests.sh'.
@@ -75,7 +76,7 @@ $(srcdir)/config-shell-tests.am: gen-config-shell-tests
Makefile.am
EXTRA_DIST += gen-config-shell-tests
TEST_EXTENSIONS += .shtst
-SHTST_LOG_COMPILER = $(SHELL) $(srcdir)/config-shell-tests.sh
+SHTST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/config-shell-tests.sh
EXTRA_DIST += config-shell-tests.sh
# All `*-w.shtst' tests work by sourcing the script `config-shell-tests.sh'.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ea766f6..f5a2208 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -289,7 +289,12 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+
+# Run the tests with the shell detected at configure time.
+LOG_COMPILER = $(SHELL)
TEST_EXTENSIONS = .test .tap .ptest .shtst
+TEST_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_DRIVER = $(PERL) $(top_srcdir)/lib/tap-driver
TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string `printf \
'\043%%\043\n'`
@@ -299,11 +304,6 @@ EXTRA_DIST = ChangeLog-old gen-parallel-tests
parallel-tests.sh \
$(handwritten_tests) tap-functions.sh plain-functions.sh \
trivial-test-driver testsuite-summary-checks.sh \
extract-testsuite-summary tap-setup.sh tap-summary-aux.sh
-
-# Run the tests with the shell detected at configure time.
-LOG_COMPILER = $(SHELL)
-TEST_LOG_COMPILER = $(LOG_COMPILER)
-TAP_LOG_COMPILER = $(LOG_COMPILER)
XFAIL_TESTS = \
all.test \
auxdir2.test \
@@ -326,13 +326,13 @@ parallel_tests = backcompat5-p.ptest
check-exported-srcdir-p.ptest \
comment9-p.ptest dejagnu-p.ptest exeext4-p.ptest \
maken3-p.ptest maken4-p.ptest posixsubst-tests-p.ptest \
tests-environment-p.ptest
-PTEST_LOG_COMPILER = $(SHELL) $(srcdir)/parallel-tests.sh
+PTEST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/parallel-tests.sh
config_shell_tests = ar-lib-w.shtst compile-w.shtst compile2-w.shtst \
compile3-w.shtst compile4-w.shtst compile5-w.shtst \
compile6-w.shtst instsh2-w.shtst instsh3-w.shtst \
mdate5-w.shtst mdate6-w.shtst missing-w.shtst missing2-w.shtst \
missing3-w.shtst missing5-w.shtst mkinst3-w.shtst
-SHTST_LOG_COMPILER = $(SHELL) $(srcdir)/config-shell-tests.sh
+SHTST_LOG_COMPILER = $(LOG_COMPILER) $(srcdir)/config-shell-tests.sh
# Some testsuite-influential variables should be overridable from the
# test scripts, but not from the environment.
--
1.7.2.3
- [FYI 1/7] {tap-test-protocols} testsuite: run TAP and "plain" tests with the same $(LOG_COMPILER), Stefano Lattarini, 2011/08/07
- [FYI 2/7] {tap-test-protocols} testsuite: run autogenerated tests with $(LOG_COMPILER) too,
Stefano Lattarini <=
- [FYI 3/7] {tap-test-protocols} testsuite: TAP tests can have early plan now, Stefano Lattarini, 2011/08/07
- [FYI 4/7] {tap-test-protocols} testsuite: update "user interface" description in tests/README, Stefano Lattarini, 2011/08/07
- [FYI 5/7] {tap-test-protocols} testsuite: improve and refactor our custom TAP shell library, Stefano Lattarini, 2011/08/07
- [FYI 6/7] {tap-test-protocols} testsuite: TAP tests properly decide when to remove tempdirs, Stefano Lattarini, 2011/08/07
- [FYI 7/7] {tap-test-protocols} test defs: get name of TAP-using tests correctly, Stefano Lattarini, 2011/08/07