New tests for Automake silent-mode with Fortran (77 and 90). * tests/silentf77.test: New test. * tests/silentf90.test: Likewise. * tests/Makefile.am (TESTS): Updated accordingly.
From b13c7b13ef07fa92df96f643c3f0e463d32b6276 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu, 22 Apr 2010 21:08:10 +0200 Subject: [PATCH 4/5] New tests for Automake silent-mode with Fortran.
* tests/silentf77.test: New test. * tests/silentf90.test: Likewise. * tests/Makefile.am (TESTS): Updated accordingly. --- ChangeLog | 5 +++ tests/Makefile.am | 2 + tests/Makefile.in | 2 + tests/silentf77.test | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/silentf90.test | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 196 insertions(+), 0 deletions(-) create mode 100755 tests/silentf77.test create mode 100755 tests/silentf90.test diff --git a/ChangeLog b/ChangeLog index 64b3edb..a0eacf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-04-22 Stefano Lattarini <stefano.lattar...@gmail.com> + New tests for Automake silent-mode with Fortran. + * tests/silentf77.test: New test. + * tests/silentf90.test: Likewise. + * tests/Makefile.am (TESTS): Updated accordingly. + New test `silentcxx.test' (Automake silent-mode with C++). * tests/silentcxx.test: New test. * tests/Makefile.am (TESTS): Updated accordingly. diff --git a/tests/Makefile.am b/tests/Makefile.am index f2f7fd5..eefdb41 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -625,6 +625,8 @@ silent7.test \ silent8.test \ silent9.test \ silentcxx.test \ +silentf77.test \ +silentf90.test \ silentlex.test \ silentyacc.test \ sinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 4b8ab84..fb75877 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -866,6 +866,8 @@ silent7.test \ silent8.test \ silent9.test \ silentcxx.test \ +silentf77.test \ +silentf90.test \ silentlex.test \ silentyacc.test \ sinclude.test \ diff --git a/tests/silentf77.test b/tests/silentf77.test new file mode 100755 index 0000000..499a643 --- /dev/null +++ b/tests/silentf77.test @@ -0,0 +1,94 @@ +#!/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 Fortran 77. +# Keep this ins sync with the sister test silentf90.test. + +required='gfortran' +. ./defs + +set -e + +mkdir sub + +cat >>configure.in <<'EOF' +AM_SILENT_RULES +AC_PROG_F77 +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.f +foo2_SOURCES = $(foo1_SOURCES) +foo2_FFLAGS = $(AM_FFLAGS) +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.f +bar2_SOURCES = $(bar1_SOURCES) +bar2_FFLAGS = $(AM_FFLAGS) +EOF + +cat > foo.f <<'EOF' + program foo + stop + end +EOF +cp foo.f sub/bar.f + +$ACLOCAL +$AUTOMAKE --add-missing +$AUTOCONF + +./configure $config_args --enable-silent-rules +$MAKE >stdout || { cat stdout; Exit 1; } +cat stdout +grep ' -c' stdout && Exit 1 +grep ' -o' stdout && Exit 1 +grep mv stdout && Exit 1 + +grep 'F77 .*foo\.' stdout +grep 'F77 .*bar\.' stdout +$EGREP 'F77LD .*foo1( |$)' stdout +$EGREP 'F77LD .*bar1( |$)' stdout +$EGREP 'F77LD .*foo2( |$)' stdout +$EGREP 'F77LD .*bar2( |$)' stdout + +grep 'FC ' stdout && Exit 1 +grep 'FCLD ' stdout && Exit 1 + +# Ensure a clean rebuild. +$MAKE clean + +$MAKE V=1 >stdout || { cat stdout; Exit 1; } +cat stdout +grep ' -c ' stdout +grep ' -o ' stdout + +grep 'F77 ' stdout && Exit 1 +grep 'FC ' stdout && Exit 1 +grep 'LD ' stdout && Exit 1 + +# Ensure a clean reconfiguration/rebuild. +$MAKE clean +$MAKE maintainer-clean diff --git a/tests/silentf90.test b/tests/silentf90.test new file mode 100755 index 0000000..54af824 --- /dev/null +++ b/tests/silentf90.test @@ -0,0 +1,93 @@ +#!/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 Fortran 90. +# Keep this ins sync with the sister test silentf77.test. + +required='gfortran' +. ./defs + +set -e + +mkdir sub + +cat >>configure.in <<'EOF' +AM_SILENT_RULES +AC_PROG_FC +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.f90 +foo2_SOURCES = $(foo1_SOURCES) +foo2_FCFLAGS = $(AM_FCLAGS) +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.f90 +bar2_SOURCES = $(bar1_SOURCES) +bar2_FCFLAGS = $(AM_FCLAGS) +EOF + +cat > foo.f90 <<'EOF' + program foo + stop + end +EOF +cp foo.f90 sub/bar.f90 + +$ACLOCAL +$AUTOMAKE --add-missing +$AUTOCONF + +./configure --enable-silent-rules +$MAKE >stdout || { cat stdout; Exit 1; } +cat stdout +grep ' -c' stdout && Exit 1 +grep ' -o' stdout && Exit 1 +grep mv stdout && Exit 1 + +grep 'FC .*foo\.' stdout +grep 'FC .*bar\.' stdout +$EGREP 'FCLD .*foo1( |$)' stdout +$EGREP 'FCLD .*bar1( |$)' stdout +$EGREP 'FCLD .*foo2( |$)' stdout +$EGREP 'FCLD .*bar2( |$)' stdout + +grep 'F77 ' stdout && Exit 1 +grep 'F77LD ' stdout && Exit 1 + +# Ensure a clean rebuild. +$MAKE clean + +$MAKE V=1 >stdout || { cat stdout; Exit 1; } +cat stdout +grep ' -c ' stdout +grep ' -o ' stdout + +grep 'F77 ' stdout && Exit 1 +grep 'FC ' stdout && Exit 1 +grep 'LD ' stdout && Exit 1 + +$MAKE clean +$MAKE maintainer-clean -- 1.6.5
