Signed-off-by: Stefano Lattarini <[email protected]> --- lib/am/color-tests.am | 2 +- lib/am/parallel-tests.am | 4 ++-- lib/am/serial-tests.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/am/color-tests.am b/lib/am/color-tests.am index d2e2a7d..a7cf297 100644 --- a/lib/am/color-tests.am +++ b/lib/am/color-tests.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -am__tty_colors = { \ +am.test-suite.tty-colors = { \ if test "X$(AM_COLOR_TESTS)" = Xno; then \ am__color_tests=no; \ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am index 86c30ef..c480fc6 100644 --- a/lib/am/parallel-tests.am +++ b/lib/am/parallel-tests.am @@ -32,7 +32,7 @@ am__is_xfail_test = \ $(if $(filter-out $(am__xfail_test_bases), \ $(patsubst $(srcdir)/%,%,$(1))),no,yes) am__runtest = \ - $(am__tty_colors); \ + $(am.test-suite.tty-colors); \ srcdir=$(srcdir); export srcdir; \ ## Creates the directory for the log file if needed. Avoid extra forks. test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?; \ @@ -314,7 +314,7 @@ am.test-suite.append-to-list-of-bases = \ $(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results) $(am.setup-test-harness-workdir) - @set +e; $(am__tty_colors); \ + @set +e; $(am.test-suite.tty-colors); \ fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \ workdir='$(am.test-suite.workdir)'; \ ## Detect a possible circular dependency, and error out if it's found. diff --git a/lib/am/serial-tests.am b/lib/am/serial-tests.am index 8850dbb..c6d7089 100644 --- a/lib/am/serial-tests.am +++ b/lib/am/serial-tests.am @@ -39,7 +39,7 @@ check-TESTS: $(am__cooked_tests) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list='$(am__cooked_tests)'; \ - $(am__tty_colors); \ + $(am.test-suite.tty-colors); \ is_xfail_test () { \ case " $(strip $(am__cooked_xfail_tests)) " in \ *" $$tst "*) return 0;; \ -- 1.7.12.rc0
