From 5957249003ff8a68044602cf10aaaf31480edb99 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 29 Aug 2011 15:36:14 +0200 Subject: [PATCH] tests: prefer AM_... variables to user-reserved ones in Makefile * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ... (AM_TAP_LOG_DRIVER_FLAGS): ... to this. --- ChangeLog | 6 ++++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 460c21314..9ff342733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-08-29 Stefano Lattarini + + tests: prefer AM_... variables to user-reserved ones in Makefile + * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ... + (AM_TAP_LOG_DRIVER_FLAGS): ... to this. + 2011-08-29 Stefano Lattarini tests: some minor fixlets w.r.t. TAP-based tests diff --git a/tests/Makefile.am b/tests/Makefile.am index 0414e4f04..d12c6539c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,7 @@ TEST_EXTENSIONS = .test .tap TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh -TAP_LOG_DRIVER_FLAGS = --merge +AM_TAP_LOG_DRIVER_FLAGS = --merge MAINTAINERCLEANFILES = EXTRA_DIST = ChangeLog-old diff --git a/tests/Makefile.in b/tests/Makefile.in index cec28b91b..faad2ae2a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -280,7 +280,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ TEST_EXTENSIONS = .test .tap TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh -TAP_LOG_DRIVER_FLAGS = --merge +AM_TAP_LOG_DRIVER_FLAGS = --merge MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ $(TESTS) tap-functions.sh plain-functions.sh \ -- 2.47.2