[Automake-NG] [PATCH 17/19] [ng] rename: am__test_* -> am.test-suite.test-*

[Stefano Lattarini]

That is:

    am__test_bases    ->  am.test-suite.test-bases
    am__test_logs     ->  am.test-suite.test-logs
    am__test_results  ->  am.test-suite.test-results

Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/parallel-tests.am        | 30 +++++++++++++++---------------
 syntax-checks.mk                |  6 +++---
 t/memoize.tap                   |  4 ++--
 t/parallel-tests-empty-tests.sh |  7 +++++--
 t/serial-tests.sh               |  2 +-
 t/test-trs-basic.sh             |  2 +-
 6 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index adabb40..d3348e5 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -40,7 +40,7 @@ am.test-suite.runtest = \
 ## We need to invoke the test in way that won't cause a PATH search.
 ## Quotes around '$<' are required to avoid extra errors when a circular
 ## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
-## $(am__test_logs)), because in that case '$<' expands to empty and an
+## $(am.test-suite.test-logs)), because in that case '$<' expands to empty and 
an
 ## unquote usage of it could cause syntax errors in the shell.
   case '$<' in */*) tst='$<';; *) tst=./'$<';; esac;                   \
 ## Executes the developer-defined and user-defined test
@@ -278,23 +278,23 @@ END { \
 am.test-suite.rst-title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && 
echo; }
 
 # This supports runtime overriding of $(TESTS) and $(XFAIL_TESTS).
-!am__test_bases ?= \
-!  $(call am.memoize,am__test_bases,$(call 
am.test-suite.get-test-bases,$(TESTS)))
+!am.test-suite.test-bases ?= \
+!  $(call am.memoize,am.test-suite.test-bases,$(call 
am.test-suite.get-test-bases,$(TESTS)))
 am.test-suite.xfail-test-bases = \
   $(call am.memoize,am.test-suite.xfail-test-bases,$(call 
am.test-suite.get-test-bases,$(XFAIL_TESTS)))
 
 # The $(strip) is to work around the GNU make 3.80 bug where trailing
 # whitespace in "TESTS = foo.test $(empty)" causes $(TESTS_LOGS) to
 # erroneously expand to "foo.log .log".
-am__test_results = \
-  $(call am.memoize,am__test_results,$(addsuffix .trs,$(strip 
$(am__test_bases))))
-am__test_logs = \
-  $(call am.memoize,am__test_logs,$(addsuffix .log,$(strip $(am__test_bases))))
+am.test-suite.test-results = \
+  $(call am.memoize,am.test-suite.test-results,$(addsuffix .trs,$(strip 
$(am.test-suite.test-bases))))
+am.test-suite.test-logs = \
+  $(call am.memoize,am.test-suite.test-logs,$(addsuffix .log,$(strip 
$(am.test-suite.test-bases))))
 
-am__mostlyclean_files += $(am__test_results) $(am__test_logs)
+am__mostlyclean_files += $(am.test-suite.test-results) 
$(am.test-suite.test-logs)
 
 # $(TEST_LOGS) is a published interface.
-TEST_LOGS = $(am__test_logs)
+TEST_LOGS = $(am.test-suite.test-logs)
 
 am.test-suite.workdir = $(am__dir)/test-harness
 
@@ -307,13 +307,13 @@ am.test-suite.append-to-list-of-bases = \
 !      @$(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))
+!             $(am.test-suite.test-bases))
 !      @workdir='$(am.test-suite.workdir)' \
 !        && sed 's/$$/.log/' $$workdir/bases > $$workdir/logs \
 !        && sed 's/$$/.trs/' $$workdir/bases > $$workdir/trs
 !endef
 
-$(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
+$(TEST_SUITE_LOG): $(am.test-suite.test-logs) $(am.test-suite.test-results)
        $(am.setup-test-harness-workdir)
        @set +e; $(am.test-suite.tty-colors); \
        fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
@@ -425,8 +425,8 @@ am__remove_if_not_lazy_check = \
   $(if $(filter yes,$(AM_LAZY_CHECK)),,$(call am.clean-cmd.f,$1))
 
 check-TESTS:
-       @$(call am__remove_if_not_lazy_check,$(am__test_results))
-       @$(call am__remove_if_not_lazy_check,$(am__test_logs))
+       @$(call am__remove_if_not_lazy_check,$(am.test-suite.test-results))
+       @$(call am__remove_if_not_lazy_check,$(am.test-suite.test-logs))
 ## We always have to remove TEST_SUITE_LOG, to ensure its rule is run
 ## in any case even in lazy mode: otherwise, if no test needs rerunning,
 ## or a prior run plus reruns all happen within the same timestamp (can
@@ -452,7 +452,7 @@ recheck: all %CHECK_DEPS%
 ## Remove newlines and normalize whitespace.
        bases=`echo $$bases`; \
 ## Re-run the relevant tests, without hitting command-line length limits.
-       echo am__test_bases="$$bases" | \
+       echo am.test-suite.test-bases="$$bases" | \
          $(MAKE) -f- -f$(firstword $(MAKEFILE_LIST)) \
                  $(TEST_SUITE_LOG) .am/doing-recheck=yes
 .PHONY: recheck
@@ -464,7 +464,7 @@ recheck: all %CHECK_DEPS%
 ## and re-run it (automake bug#11791).  This indirection is aimed at
 ## satisfying such a requirement.
 !ifeq ($(.am/doing-recheck),yes)
-!$(am__test_logs) $(am__test_results): .am/nil
+!$(am.test-suite.test-logs) $(am.test-suite.test-results): .am/nil
 !endif
 
 AM_RECURSIVE_TARGETS += check recheck
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 67a68a8..fc1a868 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -328,9 +328,9 @@ sc_no_am_makeflags:
 modern.DISTFILES = am.dist.all-files
 modern.DIST_COMMON = am.dist.common-files
 modern.DIST_SOURCES = am.dist.sources
-modern.am__TEST_BASES = am__test_bases
-modern.am__TEST_LOGS = am__test_logs
-modern.am__TEST_RESULTS = am__test_results
+modern.am__TEST_BASES = am.test-suite.test-bases
+modern.am__TEST_LOGS = am.test-suite.test-logs
+modern.am__TEST_RESULTS = am.test-suite.test-results
 modern.CONFIG_HEADER = AM_CONFIG_HEADERS
 modern.DEFAULT_INCLUDES = AM_DEFAULT_INCLUDES
 
diff --git a/t/memoize.tap b/t/memoize.tap
index d24a711..5e3646b 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -298,10 +298,10 @@ T "known GNU make issue 
(https://savannah.gnu.org/patch/?7534)" <<'END'
 setup := $(shell mkdir -p t/pm && : > t/pm/Cond2.pl)
 
 TESTS = $(wildcard t/pm/Cond2.pl)
-am__test_bases = $(call am.memoize,am__test_bases,$(TESTS))
+am.test-suite.test-bases = $(call am.memoize,am.test-suite.test-bases,$(TESTS))
 
 test:
-       test '$(am__test_bases)' = 't/pm/Cond2.pl'
+       test '$(am.test-suite.test-bases)' = 't/pm/Cond2.pl'
 END
 
 #---------------------------------------------------------------------------
diff --git a/t/parallel-tests-empty-tests.sh b/t/parallel-tests-empty-tests.sh
index aefe6b5..0960da5 100755
--- a/t/parallel-tests-empty-tests.sh
+++ b/t/parallel-tests-empty-tests.sh
@@ -32,8 +32,11 @@ mkdir sub1 sub2
 cat > sub1/Makefile.am << 'END'
 TESTS =
 check-local:
-       echo $(am__test_logs) $(am__test_results) $(am__test_bases) \
-         | grep . && exit 1; exit 0
+       echo \
+          $(am.test-suite.test-logs) \
+          $(am.test-suite.test-results) \
+          $(am.test-suite.test-bases) \
+       | grep . && exit 1; exit 0
 END
 
 cat > sub2/Makefile.am << 'END'
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index 5e008ff..d90de29 100755
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -30,7 +30,7 @@ has_parallel_tests ()
 {
   $EGREP '(^| )check-TESTS.*:' $1
   $EGREP '(^| )recheck.*:' $1
-  $EGREP '^\$\(TEST_SUITE_LOG\):.* \$\(am__test_logs\)( |$)' $1
+  $EGREP '^\$\(TEST_SUITE_LOG\):.* \$\(am\.test-suite\.test-logs\)( |$)' $1
   grep '%\.log %\.trs *:' $1
 }
 
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index 7947e63..edb2313 100755
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
@@ -34,7 +34,7 @@ SH_LOG_COMPILER = $(SHELL)
 ## $(am__tests_bases) are deliberate: they check for whitespace
 ## normalization.
 tb:
-       echo '$(am__test_bases)' > $@
+       echo '$(am.test-suite.test-bases)' > $@
 END
 
 cat > foo.test << 'END'
-- 
1.7.12.rc0