From: Stefano Lattarini Date: Tue, 3 Jan 2012 22:26:56 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b13742fa9cb45dd7b616ec54d7cea59a07c0876;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: install: pkglibexec_SCRIPTS is a valid prefix/primary combination coverage: expose automake bug#10128 progs, libs: implement EXTRA_foo_DEPENDENCIES tests: fix spurious failures in 'pr300*.test' --- 5b13742fa9cb45dd7b616ec54d7cea59a07c0876 diff --cc NEWS index 699f2af76,2e572e43a..4f4f4bd46 --- a/NEWS +++ b/NEWS @@@ -261,15 -75,24 +261,20 @@@ New in 1.11.2 the `${infodir}/dir' file, by exporting the new environment variable `AM_UPDATE_INFO_DIR' to the value "no". - - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES - and adds them to the normal list of dependencies, but without - overwriting the foo_DEPENDENCIES variable, which is normally computed - by automake. - -Bugs fixed in 1.11.0a: +Bugs fixed in 1.11.2: + * Bugs introduced by 1.11.2: + + - Automake now correctly recognizes the prefix/primary combination + `pkglibexec_SCRIPTS' as valid. + * Bugs introduced by 1.11: - - The `parallel-tests' test driver works around a GNU make 3.80 bug with - trailing white space in the test list (`TESTS = foo $(EMPTY)'), and - does not report spurious successes when used with concurrent FreeBSD - make (e.g., "make check -j3"). + - The parallel-tests driver no longer produces erroneous results with + Tru64/OSF 5.1 sh upon unreadable log files. + + - The `parallel-tests' test driver does not report spurious successes + when used with concurrent FreeBSD make (e.g., "make check -j3"). - When the parallel-tests driver is in use, automake now explicitly rejects invalid entries and conditional contents in TEST_EXTENSIONS, diff --cc tests/Makefile.am index 78312a604,ff5644271..9c95e29d4 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -16,36 -17,15 +17,37 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Run the tests with the shell detected at configure time. +LOG_COMPILER = $(SHELL) + +TEST_EXTENSIONS = .test .tap +TEST_LOG_COMPILER = $(LOG_COMPILER) +TAP_LOG_COMPILER = $(LOG_COMPILER) + +TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh + +AM_TAP_LOG_DRIVER_FLAGS = --merge --comments +## Avoid spurious TAP diagnostic. We use an awful indirection with a +## shell command substitution here, since the string needs to contain +## `#' characters, and these can't be escaped portably in a make macro +## definition. +## FIXME: this is quite inefficient though, as it adds one extra fork +## FIXME: per TAP test script; this is OK for the moment, since we have +## FIXME: few such scripts, but might become an issue in the future. +## Keep this in sync with the definition of $diag_string_ in tests/defs. +AM_TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'` + +EXTRA_DIST = ChangeLog-old + +TESTS = ## Will be updated later. + XFAIL_TESTS = \ all.test \ -auxdir2.test \ cond17.test \ -dist-auxfile.test \ -dist-auxfile-2.test \ gcj6.test \ +override-conditional-2.test \ java-nobase.test \ + objext-pr10128.test \ pr8365-remake-timing.test \ lex-subobj-nodep.test \ remake-am-pr10111.test \ diff --cc tests/pr300-lib.test index 53dae5eff,8f96db11a..673845e9a --- a/tests/pr300-lib.test +++ b/tests/pr300-lib.test @@@ -1,5 -1,5 +1,6 @@@ #! /bin/sh - # Copyright (C) 2002, 2007, 2010, 2011 Free Software Foundation, Inc. -# Copyright (C) 2002, 2007, 2010, 2012 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2007, 2010, 2011, 2012 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 @@@ -43,9 -45,14 +44,14 @@@ EN $ACLOCAL $AUTOCONF -$AUTOMAKE --copy --add-missing +$AUTOMAKE -Wno-extra-portability --copy --add-missing - ./configure --prefix "`pwd`/inst" + # We pass '--libdir' explicitly, to avoid spurious failures due to users + # or distributions possibly overriding '${libdir}' in their $CONFIG_SITE + # file (for example, defining it to '${prefix}/lib64' on 64-bit systems, + # as is the case with openSUSE 12.1). See automake bug#10426. + cwd=`pwd` || Exit 99 + ./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib" $MAKE diff --cc tests/pr300-ltlib.test index 18201e6a1,06d3c32b8..24584e3e2 --- a/tests/pr300-ltlib.test +++ b/tests/pr300-ltlib.test @@@ -1,5 -1,5 +1,5 @@@ #! /bin/sh - # Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011 Free Software -# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2012 Free Software ++# Copyright (C) 2002, 2007, 2008, 2009, 2010, 2011, 2012 Free Software # Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@@ -42,15 -44,20 +42,20 @@@ EN libtoolize $ACLOCAL $AUTOCONF -$AUTOMAKE --copy --add-missing +$AUTOMAKE -Wno-extra-portability --copy --add-missing - ./configure --prefix "`pwd`/inst" + # We pass '--libdir' explicitly, to avoid spurious failures due to users + # or distributions possibly overriding '${libdir}' in their $CONFIG_SITE + # file (for example, defining it to '${prefix}/lib64' on 64-bit systems, + # as is the case with openSUSE 12.1). See automake bug#10426. + cwd=`pwd` || Exit 99 + ./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib" -$MAKE V=1 >stdout || { cat stdout; Exit 1; } +# A rule in the Makefile should create subdir. +test ! -d subdir +$MAKE >stdout || { cat stdout; Exit 1; } cat stdout +test -d subdir grep 'liba.la .*-rpath .*lib' stdout grep 'liba.la .*-rpath .*lib/subdir' stdout && Exit 1