Hash :
1609491e
Author :
Date :
2010-12-20T18:29:50
Warnings win over strictness in AUTOMAKE_OPTIONS. Ensure that, for what concerns the options specified in AUTOMAKE_OPTIONS, explicitly-defined warnings always take precedence over implicit strictness-implied warnings. This finally fixes Automake bug#7669 a.k.a. PR/547. * automake.in (handle_options): Call 'process_option_list' only once per set of options. * lib/Automake/Options.pm (process_global_option_list, process_option_list): Add sanity checks. ($_options_processed, $_global_options_processed): New internal variables, used by the sanity checks above. * tests/warnings-win-over-strictness.test: Extend.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
#! /bin/sh
# Copyright (C) 2011 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check that, on the command line, explicitly-defined warnings take
# precedence over implicit strictness-implied warnings.
. ./defs || Exit 1
# We want complete control over automake options.
AUTOMAKE=$original_AUTOMAKE
ok ()
{
AUTOMAKE_run 0 $*
test ! -s stderr
}
ko ()
{
AUTOMAKE_run 0 $*
grep '^Makefile\.am:.*:=.*not portable' stderr
test `wc -l <stderr` -eq 1
}
set_am_opts()
{
set +x
sed <$2 >$2-t -e "s|^\\(AUTOMAKE_OPTIONS\\) *=.*|\\1 = $1|" \
-e "s|^\\(AM_INIT_AUTOMAKE\\).*|\\1([$1])|"
mv -f $2-t $2
set -x
cat $2
}
# Files required in gnu strictness.
touch README INSTALL NEWS AUTHORS ChangeLog COPYING
cat > Makefile.am <<END
AUTOMAKE_OPTIONS =
FOO := bar
END
$ACLOCAL
ko --foreign -Wportability
ko -Wportability --foreign
ok --gnu -Wno-portability
ok -Wno-portability --gnu
set_am_opts '' Makefile.am
rm -rf autom4te*.cache
set_am_opts 'foreign -Wportability' configure.in
ko
rm -rf autom4te*.cache
set_am_opts '-Wportability foreign' configure.in
ko
rm -rf autom4te*.cache
set_am_opts 'gnu -Wno-portability' configure.in
ok
rm -rf autom4te*.cache
set_am_opts '-Wno-portability gnu' configure.in
ok
rm -rf autom4te*.cache
set_am_opts '' configure.in
set_am_opts 'foreign -Wportability' Makefile.am
ko
set_am_opts '-Wportability foreign' Makefile.am
ko
set_am_opts 'gnu -Wno-portability' Makefile.am
ok
set_am_opts '-Wno-portability gnu' Makefile.am
ok
: