From: Stefano Lattarini Date: Fri, 24 Dec 2010 20:10:26 +0000 (+0100) Subject: More tests on warnings/strictness precedence. X-Git-Tag: ng-0.5a~254^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228b82698e108071a053581a17e6b89c58fbf9be;p=thirdparty%2Fautomake.git More tests on warnings/strictness precedence. * tests/warning-groups-win-over-strictness.test: New test, similar to `warnings-win-over-strictness.test', but checking the explicit catch-all warning flags (like `-Wall' and `-Wnone'). * tests/Makefile.am (TESTS): Update. --- diff --git a/ChangeLog b/ChangeLog index b5eb29852..86d314c36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-01-15 Stefano Lattarini + More tests on warnings/strictness precedence. + * tests/warning-groups-win-over-strictness.test: New test, similar + to `warnings-win-over-strictness.test', but checking the explicit + catch-all warning flags (like `-Wall' and `-Wnone'). + * tests/Makefile.am (TESTS): Update. + Update NEWS about the warnings-over-strictness precedence. * NEWS: Automake explicit warning levels always take precedence over the implicit warning levels implied by Automake strictness. diff --git a/tests/Makefile.am b/tests/Makefile.am index 68c176730..eb7f712b5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -953,6 +953,7 @@ warnings-strictness-interactions.test \ warnings-unknown.test \ warnopts.test \ warnings-win-over-strictness.test \ +warning-groups-win-over-strictness.test \ werror.test \ werror2.test \ werror3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 1a244acf5..ac88261e3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1216,6 +1216,7 @@ warnings-strictness-interactions.test \ warnings-unknown.test \ warnopts.test \ warnings-win-over-strictness.test \ +warning-groups-win-over-strictness.test \ werror.test \ werror2.test \ werror3.test \ diff --git a/tests/warning-groups-win-over-strictness.test b/tests/warning-groups-win-over-strictness.test new file mode 100755 index 000000000..a29144211 --- /dev/null +++ b/tests/warning-groups-win-over-strictness.test @@ -0,0 +1,64 @@ +#! /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 . + +# Check that explicitly-defined warning levels take precedence over +# implicit strictness-implied warnings, even when these explicit warning +# levels are "catch-all warnings" (such as `-Wall' and `-Wnone'). +# Since we are at it, also throw in *.am and *.m4 file inclusions. + +. ./defs || Exit 1 + +# We want complete control over automake options. +AUTOMAKE=$original_AUTOMAKE + +# Files required in gnu and/or gnits strictness. +touch README INSTALL NEWS AUTHORS ChangeLog COPYING THANKS + +cat > configure.in << END +AC_INIT([$me], [1.0]) +m4_include([am-init-automake.m4]) +AC_PROG_CC +AC_CONFIG_FILES([Makefile]) +# Other similar tests do not use AC_OUTPUT, so we use it here, +# for completeness and for better coverage. +AC_OUTPUT +END + +cat > Makefile.am < automake-options.am +echo 'AM_INIT_AUTOMAKE' > am-init-automake.m4 +$ACLOCAL +AUTOMAKE_fails -Werror -Wall --foreign +grep '^Makefile\.am:.*:=.*not portable' stderr + +rm -rf autom4te*.cache +: > automake-options.am +echo 'AM_INIT_AUTOMAKE([-Werror -Wnone gnu])' > am-init-automake.m4 +$ACLOCAL +$AUTOMAKE + +rm -rf autom4te*.cache +echo 'AUTOMAKE_OPTIONS = -Werror -Wnone gnits' > automake-options.am +echo 'AM_INIT_AUTOMAKE' > am-init-automake.m4 +$ACLOCAL +$AUTOMAKE + +: