[Automake-commit] [SCM] GNU Automake branch, je-silent, updated. Release-1-10-278-g19e0c0a

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=19e0c0ae4b457c0c32f43ac4cbc26dc9965b02a5

The branch, je-silent has been updated
       via  19e0c0ae4b457c0c32f43ac4cbc26dc9965b02a5 (commit)
      from  f04bfdf3e333e1ba15ab9ad02355aad503c28e48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 19e0c0ae4b457c0c32f43ac4cbc26dc9965b02a5
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Mar 9 21:20:20 2009 +0100

    Let -Wportability turn on/off the portability-recursive channel.
    
    * lib/Automake/ChannelDefs.pm (switch_warning): switch
    `portability-recursive' channel as well if changing the
    `portability' channel.
    * tests/dollarvar2.test: New test.
    * tests/Makefile.am: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |    9 +++++++++
 lib/Automake/ChannelDefs.pm            |    2 ++
 tests/Makefile.am                      |    1 +
 tests/Makefile.in                      |    1 +
 tests/{colneq.test => dollarvar2.test} |   28 ++++++++++++++++------------
 5 files changed, 29 insertions(+), 12 deletions(-)
 copy tests/{colneq.test => dollarvar2.test} (65%)

diff --git a/ChangeLog b/ChangeLog
index 888368f..183890a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-09  Ralf Wildenhues  <address@hidden>
+
+       Let -Wportability turn on/off the portability-recursive channel.
+       * lib/Automake/ChannelDefs.pm (switch_warning): switch
+       `portability-recursive' channel as well if changing the
+       `portability' channel.
+       * tests/dollarvar2.test: New test.
+       * tests/Makefile.am: Update.
+
 2009-03-07  Ralf Wildenhues  <address@hidden>
 
        New automake command line option `--silent-rules'.
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 60520b7..436a904 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -281,6 +281,8 @@ sub switch_warning ($)
   elsif (channel_type ($cat) eq 'warning')
     {
       setup_channel $cat, silent => $has_no;
+      setup_channel 'portability-recursive', silent => $has_no
+        if $cat eq 'portability';
     }
   else
     {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b66bff..a1af65d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -241,6 +241,7 @@ distdir.test \
 distname.test \
 dollar.test \
 dollarvar.test \
+dollarvar2.test \
 double.test \
 dup2.test \
 else.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 42a149f..04b6582 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -396,6 +396,7 @@ distdir.test \
 distname.test \
 dollar.test \
 dollarvar.test \
+dollarvar2.test \
 double.test \
 dup2.test \
 else.test \
diff --git a/tests/colneq.test b/tests/dollarvar2.test
similarity index 65%
copy from tests/colneq.test
copy to tests/dollarvar2.test
index 39ef93d..676cde2 100755
--- a/tests/colneq.test
+++ b/tests/dollarvar2.test
@@ -1,5 +1,5 @@
-#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003  Free Software Foundation, Inc.
+#!/bin/sh
+# Copyright (C) 2009  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,21 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test that := definitions produce warnings, but otherwise work.
+# Test to make sure that -Wportability turns on portability-recursive,
+# likewise for -Wno-...
 
-. ./defs || Exit 1
+. ./defs
 
 set -e
 
-cat > Makefile.am << 'END'
-ICONS := $(wildcard *.xbm)
-data_DATA = $(ICONS)
-END
+cat >Makefile.am <<'EOF'
+x = 1
+bla = $(foo$(x))
+EOF
 
 $ACLOCAL
-AUTOMAKE_fails
-grep ':=.*not portable' stderr
 
+# $AUTOMAKE already contains -Wall -Werror.
+AUTOMAKE_fails -Wportability
+$AUTOMAKE --force -Wno-all
+$AUTOMAKE --force -Wno-portability
 echo 'AUTOMAKE_OPTIONS = -Wno-portability' >> Makefile.am
-$AUTOMAKE
-grep 'ICONS :=' Makefile.in
+$AUTOMAKE --force
+
+:


hooks/post-receive
--
GNU Automake