Patch updated (with the test slighty extended).
From 8d166efb4b090375e88afff8b1c7ca40d3095b1c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Tue, 27 Apr 2010 02:02:12 +0200 Subject: [PATCH 3/9] New test silentyacc.test (Automake/Yacc silent-mode).
* tests/silentyacc.test: New test. * tests/Makefile.am (TESTS): Updated accordingly. --- ChangeLog | 4 ++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/silentyacc.test | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 0 deletions(-) create mode 100755 tests/silentyacc.test diff --git a/ChangeLog b/ChangeLog index 580f282..b2b9496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-27 Stefano Lattarini <stefano.lattar...@gmail.com> + New test `silentyacc.test' (Automake silent-mode with Yacc). + * tests/silentyacc.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + New test `silentlex.test' (Automake silent-mode with Lex). * tests/silentlex.test: New test. * tests/Makefile.am (TESTS): Updated accordingly. diff --git a/tests/Makefile.am b/tests/Makefile.am index c945ebe..600eda6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -625,6 +625,7 @@ silent7.test \ silent8.test \ silent9.test \ silentlex.test \ +silentyacc.test \ sinclude.test \ srcsub.test \ srcsub2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index e93c616..5fb8bd1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -866,6 +866,7 @@ silent7.test \ silent8.test \ silent9.test \ silentlex.test \ +silentyacc.test \ sinclude.test \ srcsub.test \ srcsub2.test \ diff --git a/tests/silentyacc.test b/tests/silentyacc.test new file mode 100755 index 0000000..ac5f061 --- /dev/null +++ b/tests/silentyacc.test @@ -0,0 +1,144 @@ +#!/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/>. + +# Check silent-rules mode for Yacc. + +required='bison' +. ./defs + +set -e + +mkdir sub + +cat >>configure.in <<'EOF' +AM_SILENT_RULES +AM_PROG_CC_C_O +AC_PROG_YACC +AC_CONFIG_FILES([sub/Makefile]) +AC_OUTPUT +EOF + +cat > Makefile.am <<'EOF' +# Need generic and non-generic rules. +bin_PROGRAMS = foo1 foo2 +foo1_SOURCES = foo.y +foo2_SOURCES = $(foo1_SOURCES) +foo2_CFLAGS = $(AM_CPPFLAGS) +SUBDIRS = sub +EOF + +cat > sub/Makefile.am <<'EOF' +AUTOMAKE_OPTIONS = subdir-objects +# Need generic and non-generic rules. +bin_PROGRAMS = bar1 bar2 +bar1_SOURCES = bar.y +bar2_SOURCES = $(bar1_SOURCES) +bar2_CFLAGS = $(AM_CPPFLAGS) +EOF + +cat > foo.y <<'EOF' +%{ +void yyerror (char *s) {} +int yylex (void) {return 0;} +int main(void) {return 0;} +%} +%token EOF +%% +fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {}; +EOF +cp foo.y sub/bar.y + +$ACLOCAL +$AUTOMAKE --add-missing +$AUTOCONF + +# configure once for fastdep, once for non-fastdep, once for nodep +for config_args in \ + '' \ + am_cv_CC_dependencies_compiler_type=gcc \ + --disable-dependency-tracking +do + ./configure $config_args --enable-silent-rules + + $MAKE >stdout || { cat stdout; Exit 1; } + cat stdout + + $EGREP ' (-c|-o)' stdout && Exit 1 + $EGREP '(mv|ylwrap) ' stdout && Exit 1 + + grep 'YACC .*foo\.' stdout + grep 'YACC .*bar\.' stdout + grep ' CC .*foo\.' stdout + grep ' CC .*bar\.' stdout + grep 'CCLD .*foo1' stdout + grep 'CCLD .*bar1' stdout + grep 'CCLD .*foo2' stdout + grep 'CCLD .*bar2' stdout + + # Cleaning and then rebuilding with the same V flag (and without + # removing the generated sources in between) shouldn't trigger a + # different set of rules. + $MAKE clean + + $MAKE >stdout || { cat stdout; Exit 1; } + cat stdout + + $EGREP ' (-c|-o)' stdout && Exit 1 + $EGREP '(mv|ylwrap) ' stdout && Exit 1 + + # Don't look for YACC, as probably yacc hasn't been re-run. + grep ' CC .*foo\.' stdout + grep ' CC .*bar\.' stdout + grep 'CCLD .*foo1' stdout + grep 'CCLD .*bar1' stdout + grep 'CCLD .*foo2' stdout + grep 'CCLD .*bar2' stdout + + # Ensure a truly clean rebuild. + $MAKE clean + rm -f foo.[ch] sub/bar.[ch] + + $MAKE V=1 >stdout || { cat stdout; Exit 1; } + cat stdout + + grep ' -c ' stdout + grep ' -o ' stdout + grep 'ylwrap ' stdout + + $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1 + + # Cleaning and then rebuilding with the same V flag (and without + # removing the generated sources in between) shouldn't trigger a + # different set of rules. + $MAKE clean + + $MAKE V=1 >stdout || { cat stdout; Exit 1; } + cat stdout + + # Don't look for ylwrap, as probably lex hasn't been re-run. + grep ' -c ' stdout + grep ' -o ' stdout + + $EGREP '(YACC|CC|CCLD) ' stdout && Exit 1 + + # Ensure a truly clean reconfiguration/rebuild. + $MAKE clean + $MAKE maintainer-clean + rm -f foo.[ch] sub/bar.[ch] + +done + +: -- 1.6.5
