Hash :
38e1b39d
Author :
Date :
2011-11-03T13:50:06
Merge branch 'msvc' into master Commits merged from msvc: - tests: few improvements to some `ar-lib' related tests - warnings: new 'extra-portability' category, for AM_PROG_AR - ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script Extra changes required by the testsuite: * tests/instspc-tests.sh: Adjust to new portability requirements due to the new AM_PROG_AR macro. * tests/libobj-basic.test: Likewise. * tests/libobj2.test: Likewise. * tests/libobj15a.test: Likewise. * tests/libobj15b.test: Likewise. * tests/libobj15c.test: Likewise. * tests/libobj16a.test: Likewise. * tests/libobj16b.test: Likewise. * tests/libobj17.test: Likewise. * tests/libobj18.test: Likewise. * tests/libobj19.test: Likewise. * tests/libobj20a.test: Likewise. * tests/libobj20b.test: Likewise. * tests/libobj20c.test: Likewise. * tests/canon6.test: Likewise. * tests/canon6.test: Likewise. * tests/canon7.tests: Likewise. * tests/extra9.test: Likewise. * tests/extradep.test: Likewise. * tests/extradep2.test: Likewise. * tests/posixsubst-ldadd.test: Likewise. * tests/posixsubst-libraries.test: Likewise. * tests/posixsubst-ltlibraries.test: Likewise. * tests/python-virtualenv.test: Likewise. * tests/vartypos.test: Likewise. * tests/vartypo2.test: Likewise. * tests/suffix.test: Update to take into account previous master-only changes. * tests/suffix2.test: Likewise. * tests/libobj7.test: Call automake with the `--add-missing' option, instead of creating a dummy `ar-lib' file, since this test now also runs "./configure" and "make". * tests/suffix5.test: Copy the real `ar-lib' script file, instead of creating a dummy one, since this test now also runs "./configure" and "make". * tests/extra-portability2.test: Fix this test not to rely on the older, faulty semantics of "strictness specification always reset warning level", which has been fixed in commit v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547). Since we are at it, throw inf few other minor unrelated improvements. * tests/extra-portability.test: Explicitly pass `-Wall' to automake calls, for clarity.
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
#! /bin/sh
# Copyright (C) 2010, 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/>.
# Make sure we warn about possible variable typos when we should.
. ./defs || Exit 1
cat >>configure.in <<'END'
AC_PROG_RANLIB
AC_OUTPUT
END
cat >Makefile.am <<'END'
foo_SOURCES = unused
nodist_foo_SOURCES = unused
EXTRA_foo_SOURCES = unused
foo_LDADD = unused
foo_LDFLAGS = unused
foo_DEPENDENCIES = unused
EXTRA_foo_DEPENDENCIES = unused
libfoo_a_SOURCES = unused
nodist_libfoo_a_SOURCES = unused
EXTRA_libfoo_a_SOURCES = unused
libfoo_a_LIBADD = unused
libfoo_a_DEPENDENCIES = unused
EXTRA_libfoo_a_DEPENDENCIES = unused
END
$ACLOCAL
AUTOMAKE_fails -Wno-extra-portability
# The expected diagnostic is:
# automake: warnings are treated as errors
# Makefile.am:2: warning: variable `nodist_foo_SOURCES' is defined but no program or
# Makefile.am:2: library has `foo' as canonical name (possible typo)
# Makefile.am:1: warning: variable `foo_SOURCES' is defined but no program or
# Makefile.am:1: library has `foo' as canonical name (possible typo)
# Makefile.am:9: warning: variable `libfoo_a_SOURCES' is defined but no program or
# Makefile.am:9: library has `libfoo_a' as canonical name (possible typo)
# Makefile.am:10: warning: variable `nodist_libfoo_a_SOURCES' is defined but no program or
# Makefile.am:10: library has `libfoo_a' as canonical name (possible typo)
# Makefile.am:11: warning: variable `EXTRA_libfoo_a_SOURCES' is defined but no program or
# Makefile.am:11: library has `libfoo_a' as canonical name (possible typo)
# Makefile.am:3: warning: variable `EXTRA_foo_SOURCES' is defined but no program or
# Makefile.am:3: library has `foo' as canonical name (possible typo)
# Makefile.am:12: warning: variable `libfoo_a_LIBADD' is defined but no program or
# Makefile.am:12: library has `libfoo_a' as canonical name (possible typo)
# Makefile.am:4: warning: variable `foo_LDADD' is defined but no program or
# Makefile.am:4: library has `foo' as canonical name (possible typo)
# Makefile.am:5: warning: variable `foo_LDFLAGS' is defined but no program or
# Makefile.am:5: library has `foo' as canonical name (possible typo)
# Makefile.am:14: warning: variable `EXTRA_libfoo_a_DEPENDENCIES' is defined but no program or
# Makefile.am:14: library has `libfoo_a' as canonical name (possible typo)
# Makefile.am:7: warning: variable `EXTRA_foo_DEPENDENCIES' is defined but no program or
# Makefile.am:7: library has `foo' as canonical name (possible typo)
# Makefile.am:6: warning: variable `foo_DEPENDENCIES' is defined but no program or
# Makefile.am:6: library has `foo' as canonical name (possible typo)
# Makefile.am:13: warning: variable `libfoo_a_DEPENDENCIES' is defined but no program or
# Makefile.am:13: library has `libfoo_a' as canonical name (possible typo)
grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \
&& Exit 1
test `grep 'variable.*is defined but' stderr | wc -l` = 13
# If we add a global -Wnone, all warnings should disappear.
$AUTOMAKE -Wnone
# Likewise, if matching programs or libraries are defined.
cat >>Makefile.am <<'END'
bin_PROGRAMS = foo
lib_LIBRARIES = libfoo.a
END
$AUTOMAKE -Wno-extra-portability
: