+2010-04-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Fix per-Makefile.am setting of -Werror.
+ Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
+ Makefile.am would carry over to other Makefile.am files
+ treated afterwards by the same thread, causing inconsistent
+ and unstable exit status values.
+ * lib/Automake/Channels.pm (dup_channel_setup)
+ (drop_channel_setup): Save and restore the setting of
+ $warnings_are_errors.
+ * tests/werror3.test: New test.
+ * tests/Makefile.am: Adjust.
+ * NEWS: Update.
+
2010-04-11 Stefano Lattarini <stefano.lattarini@gmail.com>
Avoid possible false negatives in cond46.test.
- Several scripts as well as the parallel-tests testsuite driver now
exit with the right exit status upon receiving a signal.
+ - A per-Makefile.am setting of -Werror does not carry over to the
+ handling of other Makefile.am files any more.
\f
New in 1.11:
=cut
-use vars qw (@_saved_channels);
+use vars qw (@_saved_channels @_saved_werrors);
@_saved_channels = ();
+@_saved_werrors = ();
sub dup_channel_setup ()
{
$channels_copy{$k1} = {%{$channels{$k1}}};
}
push @_saved_channels, \%channels_copy;
+ push @_saved_werrors, $warnings_are_errors;
}
sub drop_channel_setup ()
{
my $saved = pop @_saved_channels;
%channels = %$saved;
+ $warnings_are_errors = pop @_saved_werrors;
}
=item C<buffer_messages (@types)>, C<flush_messages ()>
warnopts.test \
werror.test \
werror2.test \
+werror3.test \
whoami.test \
xsource.test \
xz.test \
warnopts.test \
werror.test \
werror2.test \
+werror3.test \
whoami.test \
xsource.test \
xz.test \
--- /dev/null
+#! /bin/sh
+# Copyright (C) 2010 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 a per-Makefile.am -Werror setting is not carried over
+# to another Makefile.am.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >>configure.in <<\END
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+mkdir sub
+cat >sub/Makefile.am <<\END
+AUTOMAKE_OPTIONS = -Werror
+END
+cat >Makefile.am <<\END
+VAR = foo
+VAR = bar
+END
+
+$ACLOCAL
+
+# The issue would not manifest with threaded execution.
+unset AUTOMAKE_JOBS || :
+AUTOMAKE_run 0 -Wno-error
+grep 'VAR multiply defined' stderr
+
+AUTOMAKE_JOBS=2
+export AUTOMAKE_JOBS
+AUTOMAKE_run 0 -Wno-error
+grep 'VAR multiply defined' stderr
+: