[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 07/19] [ng] rename: am.test-harness.* -> am.test-su
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 07/19] [ng] rename: am.test-harness.* -> am.test-suite.* |
Date: |
Fri, 27 Jul 2012 15:10:24 +0200 |
Signed-off-by: Stefano Lattarini <address@hidden>
---
lib/am/parallel-tests.am | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index c087fb6..a206b10 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -295,19 +295,19 @@ am__mostlyclean_files += $(am__test_results)
$(am__test_logs)
# $(TEST_LOGS) is a published interface.
TEST_LOGS = $(am__test_logs)
-am.test-harness.workdir = $(am__dir)/test-harness
+am.test-suite.workdir = $(am__dir)/test-harness
-am.test-harness.append-to-list-of-bases = \
+am.test-suite.append-to-list-of-bases = \
@lst='$1'; for x in $$lst; do echo $$x; done \
- >> $(am.test-harness.workdir)/bases$(am.chars.newline)
+ >> $(am.test-suite.workdir)/bases$(am.chars.newline)
!define am.setup-test-harness-workdir
-! @rm -rf $(am.test-harness.workdir)
-! @$(MKDIR_P) $(am.test-harness.workdir)
-! @touch $(am.test-harness.workdir)/bases
-! $(call am.xargs-map,am.test-harness.append-to-list-of-bases, \
+! @rm -rf $(am.test-suite.workdir)
+! @$(MKDIR_P) $(am.test-suite.workdir)
+! @touch $(am.test-suite.workdir)/bases
+! $(call am.xargs-map,am.test-suite.append-to-list-of-bases, \
! $(am__test_bases))
-! @workdir='$(am.test-harness.workdir)' \
+! @workdir='$(am.test-suite.workdir)' \
! && sed 's/$$/.log/' $$workdir/bases > $$workdir/logs \
! && sed 's/$$/.trs/' $$workdir/bases > $$workdir/trs
!endef
@@ -316,7 +316,7 @@ $(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
$(am.setup-test-harness-workdir)
@set +e; $(am__tty_colors); \
fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
- workdir='$(am.test-harness.workdir)'; \
+ workdir='$(am.test-suite.workdir)'; \
## Detect a possible circular dependency, and error out if it's found.
grep '^$(TEST_SUITE_LOG:.log=)$$' $$workdir/bases \
&& fatal "depends on itself (check TESTS content)"; \
@@ -446,7 +446,7 @@ recheck: all %CHECK_DEPS%
## If running a "make recheck", we must only consider tests that had an
## unexpected outcome (FAIL or XPASS) in the earlier run.
@bases=`$(am.test-suite.list-tests-to-recheck) \
- <$(am.test-harness.workdir)/bases` || exit 1; \
+ <$(am.test-suite.workdir)/bases` || exit 1; \
## Remove newlines and normalize whitespace.
bases=`echo $$bases`; \
## Re-run the relevant tests, without hitting command-line length limits.
--
1.7.12.rc0
- [Automake-NG] [FYI 00/19] [ng] Several renaming patches, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 01/19] [ng] rename: am__test_result_rx -> am.test-suite.rx.result, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 02/19] [ng] rename: am__recheck_rx -> am.test-suite.rx.recheck, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 03/19] [ng] rename: am__global_test_result_rx -> am.test-suite.rx.global-result, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 04/19] [ng] rename: am__copy_in_global_log_rx -> am.test-suite.rx.copy-in-global-log, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 08/19] [ng] rename: am__create_global_log -> am.test-suite.create-global-log, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 05/19] [ng] rename: am__list_recheck_tests -> am.test-suite-list-recheck, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 12/19] [ng] rename: am__runtest -> am.test-suite.runtest, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 09/19] [ng] rename: am__rst_title -> am.test-suite.rst-title, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 07/19] [ng] rename: am.test-harness.* -> am.test-suite.*,
Stefano Lattarini <=
- [Automake-NG] [PATCH 06/19] [ng] rename: am__list_recheck_tests -> am.test-suite.list-tests-to-recheck, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 14/19] [ng] rename: am__count_test_result -> am.test-suite.count-results, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 10/19] [ng] rename: am__tty_colors -> am.test-suite.tty-colors, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 11/19] [ng] cosmetics: update a couple of outdated references in comments, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 17/19] [ng] rename: am__test_* -> am.test-suite.test-*, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 13/19] [ng] rename: am__handle_per_suffix_test -> am.test-suite.handle-suffix, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 15/19] [ng] rename: am__get_test_bases -> am.test-suite.get-test-bases, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 16/19] [ng] rename: am__xfail_test_bases -> am.test-suite.xfail-test-bases, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 18/19] [ng] rename: am__is_xfail_test -> -> am.test-suite.is-xfail, Stefano Lattarini, 2012/07/27
- [Automake-NG] [PATCH 19/19] [ng] cosmetics: improve a comment, Stefano Lattarini, 2012/07/27