[ng] refactor: read 'color-tests.am' more verbatim

* lib/am/color-tests.am (am.test-suite.tty-colors): Define with the
'define' built-in rather than with '='.
* automake.in (handle_tests): Use '&almost_verbatim' rather than
'&file_contents' to read and process 'color-tests.am'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 4799dd6907289e9b3230af7e3e5486ee68ffd973..01df5fee1501503fe66a961484b61ac7ac8fbd57 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -4102,7 +4102,7 @@ sub handle_tests
   if (var ('TESTS'))
     {
       push (@check_tests, 'check-TESTS');
-      $output_rules .= file_contents ('color-tests', new Automake::Location);
+      almost_verbatim ('color-tests');
       if (option 'serial-tests')
         {
           almost_verbatim ('serial-tests');

diff --git a/lib/am/color-tests.am b/lib/am/color-tests.am
index a7cf297edee8f3c94520d54d057cdabb5416d8ff..eb670e5914ae8b9974c6c558a92260af7cf11496 100644 (file)
--- a/lib/am/color-tests.am
+++ b/lib/am/color-tests.am
@@ -14,7 +14,8 @@
 ## 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.test-suite.tty-colors = { \
+define 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 \
@@ -39,3 +40,4 @@ am.test-suite.tty-colors = { \
     mgn= red= grn= lgn= blu= brg= std=; \
   fi; \
 }
+endef