automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCHES v2] New requirement "cc" for tests needing a C compiler


From: Stefano Lattarini
Subject: Re: [PATCHES v2] New requirement "cc" for tests needing a C compiler
Date: Wed, 23 Jun 2010 18:17:58 +0200
User-agent: KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.4; i686; ; )

Hmpf.  No, that was not on it yet.  Some tests I left marked as requiring
"gcc" should indeed be perfectly fine with other C compilers too (e.g.
Sun C Compiler on Linux).  They just fail with pcc (Portable C Compiler,
<http://pcc.ludd.ltu.se/>), because that's still in developement and/or
is not supported by libtool.  So there should be no need to reduce the
coverage of those tests by requiring gcc.

Thus I amended my original four-patches series into a three-patches
series, in which less tests are forced to require gcc.  The three patches
are all attached.

Sorry for this mess.

Regards,
   Stefano
From 6d0a995a9a1a0bafce42daf7916c8abfe8767151 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Tue, 22 Jun 2010 16:30:47 +0200
Subject: [PATCH 1/3] New requirement "cc" for tests using a C compiler.

* tests/defs.in: Recognize a new requirement "cc", asking for
a generic C compiler.  For the moment, just skip the test if
$CC is "no", and look for gcc (exporting CC=gcc) if $CC is not
set.
* tests/autohdr5.test: New test, sister of autohdr4.test, but
does not require gcc.
* tests/yacc9.test: New test, sister of yacc6.test, but does
not require gcc.
* tests/Makefile.am (TESTS): Updated.
* tests/cond36.test: Remove useless requirement of `gcc'.
* tests/libobj14.test: Likewise.
* tests/ansi10.test: Updated.
* tests/ansi5.test: Likewise.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/ansi9.test: Likewise.
* tests/autohdr4.test: Likewise.
* tests/cond16.test: Likewise.
* tests/cond18.test: Likewise.
* tests/cond19.test: Likewise.
* tests/cond35.test: Likewise.
* tests/cond4.test: Likewise.
* tests/depcomp2.test: Likewise.
* tests/depcomp3.test: Likewise.
* tests/depcomp4.test: Likewise.
* tests/depend2.test: Likewise.
* tests/gnits2.test: Likewise.
* tests/gnits3.test: Likewise.
* tests/lex3.test: Likewise.
* tests/lex5.test: Likewise.
* tests/libtool3.test: Likewise.
* tests/libtool7.test: Likewise.
* tests/ltcond.test: Likewise.
* tests/ltcond2.test: Likewise.
* tests/ltconv.test: Likewise.
* tests/ltlibsrc.test: Likewise.
* tests/mmodely.test: Likewise.
* tests/multlib.test: Likewise.
* tests/nobase-libtool.test: Likewise.
* tests/nobase.test: Likewise.
* tests/pr204.test: Likewise.
* tests/pr220.test: Likewise.
* tests/pr224.test: Likewise.
* tests/pr300-lib.test: Likewise.
* tests/pr300-prog.test: Likewise.
* tests/pr307.test: Likewise.
* tests/pr401.test: Likewise.
* tests/pr401c.test: Likewise.
* tests/pr87.test: Likewise.
* tests/primary3.test: Likewise.
* tests/specflg7.test: Likewise.
* tests/specflg8.test: Likewise.
* tests/subdir5.test: Likewise.
* tests/subdir8.test: Likewise.
* tests/subobj10.test: Likewise.
* tests/subobj3.test: Likewise.
* tests/subobj6.test: Likewise.
* tests/subpkg.test: Likewise.
* tests/substre2.test: Likewise.
* tests/substref.test: Likewise.
* tests/suffix8.test: Likewise.
* tests/target-cflags.test: Likewise.
* tests/targetclash.test: Likewise.
* tests/transform.test: Likewise.
* tests/yacc4.test: Likewise.
* tests/yacc6.test: Likewise.
* tests/yacc8.test: Likewise.
* tests/yaccvpath.test: Likewise.
---
 ChangeLog                |   74 +++++++++++++++++++++++++++++++
 tests/Makefile.am        |    2 +
 tests/Makefile.in        |    2 +
 tests/ansi10.test        |    4 +-
 tests/ansi5.test         |    6 +-
 tests/ansi6.test         |    4 +-
 tests/ansi7.test         |    4 +-
 tests/ansi9.test         |    4 +-
 tests/autohdr4.test      |    5 +-
 tests/autohdr5.test      |   70 +++++++++++++++++++++++++++++
 tests/cond16.test        |    7 ++-
 tests/cond18.test        |    4 +-
 tests/cond19.test        |    4 +-
 tests/cond35.test        |    6 +-
 tests/cond36.test        |    6 +-
 tests/cond4.test         |    2 +-
 tests/defs.in            |   14 ++++++
 tests/depcomp2.test      |    4 +-
 tests/depcomp3.test      |    4 +-
 tests/depcomp4.test      |    4 +-
 tests/depend2.test       |    2 +-
 tests/gnits2.test        |    5 +-
 tests/gnits3.test        |    4 +-
 tests/lex3.test          |    5 +-
 tests/lex5.test          |    4 +-
 tests/libobj14.test      |    7 +--
 tests/libtool3.test      |    2 +-
 tests/libtool7.test      |    2 +-
 tests/ltcond.test        |    2 +-
 tests/ltcond2.test       |    2 +-
 tests/ltconv.test        |    2 +-
 tests/ltlibsrc.test      |    2 +-
 tests/mmodely.test       |    7 ++-
 tests/multlib.test       |   14 +++---
 tests/nobase.test        |    6 +-
 tests/pr204.test         |    4 +-
 tests/pr220.test         |    5 +-
 tests/pr224.test         |    6 +-
 tests/pr300-lib.test     |    4 +-
 tests/pr300-prog.test    |    4 +-
 tests/pr401.test         |    4 +-
 tests/pr401c.test        |    4 +-
 tests/pr87.test          |    4 +-
 tests/primary3.test      |    4 +-
 tests/specflg7.test      |    4 +-
 tests/specflg8.test      |    4 +-
 tests/subdir5.test       |    6 +-
 tests/subdir8.test       |    4 +-
 tests/subobj10.test      |    4 +-
 tests/subobj3.test       |    8 +--
 tests/subobj6.test       |    5 +-
 tests/subpkg.test        |    5 +-
 tests/substre2.test      |    2 +-
 tests/substref.test      |    2 +-
 tests/suffix8.test       |    2 +-
 tests/target-cflags.test |    5 +-
 tests/targetclash.test   |    4 +-
 tests/transform.test     |    6 +-
 tests/yacc4.test         |    4 +-
 tests/yacc6.test         |    3 +-
 tests/yacc8.test         |    5 +-
 tests/yacc9.test         |  109 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/yaccvpath.test     |    4 +-
 63 files changed, 401 insertions(+), 120 deletions(-)
 create mode 100755 tests/autohdr5.test
 create mode 100755 tests/yacc9.test

diff --git a/ChangeLog b/ChangeLog
index 469578c..b6e8a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+2010-06-23  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       New requirement "cc" for tests using a C compiler.
+       * tests/defs.in: Recognize a new requirement "cc", asking for
+       a generic C compiler.  For the moment, just skip the test if
+       $CC is "no", and look for gcc (exporting CC=gcc) if $CC is not
+       set.
+       * tests/autohdr5.test: New test, sister of autohdr4.test, but
+       does not require gcc.
+       * tests/yacc9.test: New test, sister of yacc6.test, but does
+       not require gcc.
+       * tests/Makefile.am (TESTS): Updated.
+       * tests/cond36.test: Remove useless requirement of `gcc'.
+       * tests/libobj14.test: Likewise.
+       * tests/ansi10.test: Updated.
+       * tests/ansi5.test: Likewise.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/ansi9.test: Likewise.
+       * tests/autohdr4.test: Likewise.
+       * tests/cond16.test: Likewise.
+       * tests/cond18.test: Likewise.
+       * tests/cond19.test: Likewise.
+       * tests/cond35.test: Likewise.
+       * tests/cond4.test: Likewise.
+       * tests/depcomp2.test: Likewise.
+       * tests/depcomp3.test: Likewise.
+       * tests/depcomp4.test: Likewise.
+       * tests/depend2.test: Likewise.
+       * tests/gnits2.test: Likewise.
+       * tests/gnits3.test: Likewise.
+       * tests/instspc.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/lex5.test: Likewise.
+       * tests/libtool3.test: Likewise.
+       * tests/libtool7.test: Likewise.
+       * tests/ltcond.test: Likewise.
+       * tests/ltcond2.test: Likewise.
+       * tests/ltconv.test: Likewise.
+       * tests/ltlibsrc.test: Likewise.
+       * tests/mmodely.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/nobase.test: Likewise.
+       * tests/pr204.test: Likewise.
+       * tests/pr220.test: Likewise.
+       * tests/pr224.test: Likewise.
+       * tests/pr300-lib.test: Likewise.
+       * tests/pr300-prog.test: Likewise.
+       * tests/pr401.test: Likewise.
+       * tests/pr401c.test: Likewise.
+       * tests/pr87.test: Likewise.
+       * tests/primary3.test: Likewise.
+       * tests/specflg7.test: Likewise.
+       * tests/specflg8.test: Likewise.
+       * tests/subdir5.test: Likewise.
+       * tests/subdir8.test: Likewise.
+       * tests/subobj10.test: Likewise.
+       * tests/subobj3.test: Likewise.
+       * tests/subobj6.test: Likewise.
+       * tests/subpkg.test: Likewise.
+       * tests/substre2.test: Likewise.
+       * tests/substref.test: Likewise.
+       * tests/suffix8.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+       * tests/targetclash.test: Likewise.
+       * tests/transform.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yaccvpath.test: Likewise.
+       Ideas from Ralf Wildenhues and Stefano Lattarini.  Final patch
+       by Stefano Lattarini.
+
 2010-06-21  Ralf Wildenhues  <address@hidden>
 
        Fix minor testsuite issues, update docs, for Yacc/Lex changes.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d05426d..d2343c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -115,6 +115,7 @@ autohdr.test \
 autohdr2.test \
 autohdr3.test \
 autohdr4.test \
+autohdr5.test \
 automake.test \
 auxdir.test \
 auxdir2.test \
@@ -801,6 +802,7 @@ yacc5.test \
 yacc6.test \
 yacc7.test \
 yacc8.test \
+yacc9.test \
 yaccpp.test \
 yaccvpath.test \
 yflags.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index aeeb0ca..4bead9d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -326,6 +326,7 @@ autohdr.test \
 autohdr2.test \
 autohdr3.test \
 autohdr4.test \
+autohdr5.test \
 automake.test \
 auxdir.test \
 auxdir2.test \
@@ -1012,6 +1013,7 @@ yacc5.test \
 yacc6.test \
 yacc7.test \
 yacc8.test \
+yacc9.test \
 yaccpp.test \
 yaccvpath.test \
 yflags.test \
diff --git a/tests/ansi10.test b/tests/ansi10.test
index 88b8618..d06ae9b 100755
--- a/tests/ansi10.test
+++ b/tests/ansi10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 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
@@ -16,7 +16,7 @@
 
 # Make sure ansi2knr works with $(LIBOBJS).
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ansi5.test b/tests/ansi5.test
index 2652cb7..bbc9109 100755
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -16,7 +16,7 @@
 
 # Test for ansi2knr in another directory.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
@@ -71,7 +71,7 @@ $AUTOMAKE -a
 # Ignore user CFLAGS.
 CFLAGS=
 export CFLAGS
-CC=gcc ./configure
+./configure
 
 # This is ugly!  If we set U at make time then the "wrong" file gets
 # included.
diff --git a/tests/ansi6.test b/tests/ansi6.test
index 10196ea..e07d3ae 100755
--- a/tests/ansi6.test
+++ b/tests/ansi6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2008, 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
@@ -17,7 +17,7 @@
 # Check ansi2knr on a source file in subdirectory.
 # From Kevin Ryde.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/ansi7.test b/tests/ansi7.test
index e97f517..a98605b 100755
--- a/tests/ansi7.test
+++ b/tests/ansi7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2008, 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
@@ -18,7 +18,7 @@
 # ansi6.test is the same test without subdir-objects.
 # From Kevin Ryde.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/ansi9.test b/tests/ansi9.test
index 4eb1820..51c210c 100755
--- a/tests/ansi9.test
+++ b/tests/ansi9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -18,7 +18,7 @@
 # can still be deansified.
 # Report from Paul D. Smith.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index 187429f..6129470 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 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
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check rebuild rules for AC_CONFIG_HEADERS.
-# (This should also work without GNU Make.)
+# This should also work without GNU Make, but requires the GNU C compiler.
+# Please keep this in sync with sister test 'autohdr4.test'.
 
 required=gcc
 . ./defs
diff --git a/tests/autohdr5.test b/tests/autohdr5.test
new file mode 100755
index 0000000..63dec6e
--- /dev/null
+++ b/tests/autohdr5.test
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Copyright (C) 2003, 2005, 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 rebuild rules for AC_CONFIG_HEADERS.
+# This should also work without GNU Make, ans with generic C compiler.
+# Please keep this in sync with sister test 'autohdr4.test'.
+
+required=cc
+. ./defs
+
+set -e
+
+cat >>configure.in <<'EOF'
+AC_PROG_CC
+AC_SUBST([BOT], [bot])
+AC_CONFIG_HEADERS([defs.h config.h:sub1/config.top:sub2/config.${BOT}],,
+                  [BOT=$BOT])
+AC_CONFIG_FILES([sub3/Makefile])
+AC_OUTPUT
+EOF
+
+mkdir sub1 sub2 sub3
+
+: > sub1/config.top
+echo '#define NAME "grepme1"' >sub2/config.bot
+echo SUBDIRS = sub3 >Makefile.am
+echo noinst_PROGRAMS = run >sub3/Makefile.am
+
+cat >sub3/run.c <<'EOF'
+#include <defs.h>
+#include <config.h>
+#include <stdio.h>
+
+int
+main ()
+{
+  puts (NAME); /* from config.h */
+  puts (PACKAGE); /* from defs.h */
+}
+EOF
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE
+
+./configure --enable-dependency-tracking
+$MAKE
+sub3/run | grep grepme1
+
+$sleep
+echo '#define NAME "grepme2"' > sub2/config.bot
+$MAKE
+sub3/run | grep grepme2
+
+$MAKE distcheck
diff --git a/tests/cond16.test b/tests/cond16.test
index 467b718..950ab10 100755
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -14,10 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test for bug in conditionals in SOURCES with variable substitution 
references.
+# Test for bug in conditionals in SOURCES with variable substitution
+# references.
 # Report from Richard Boulton
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/cond18.test b/tests/cond18.test
index 3119658..312b896 100755
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -17,7 +17,7 @@
 # Regression test for substitution references to conditional variables.
 # Report from Richard Boulton
 
-required='GNUmake gcc'
+required='GNUmake cc'
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/cond19.test b/tests/cond19.test
index 14dfb51..d820202 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -17,7 +17,7 @@
 # Regression test for substitution references to conditional variables.
 # Report from Richard Boulton
 
-required='GNUmake gcc'
+required='GNUmake cc'
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/cond35.test b/tests/cond35.test
index 6b3a4d4..e87a341 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -17,8 +17,8 @@
 # Check rules output for parser defined conditionally.
 # Report from Roman Fietze.
 
-required='flex bison gcc'
-. ./defs
+required='flex bison cc'
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond36.test b/tests/cond36.test
index 58eb529..f925587 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -16,8 +16,8 @@
 
 # Check rules output for parser defined conditionally.
 
-required='flex bison gcc'
-. ./defs
+required='flex bison'
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond4.test b/tests/cond4.test
index 6efc9ce..1d2910c 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -16,7 +16,7 @@
 
 # Another sources-in-conditional test.  Report from Tim Goodwin.
 
-required='GNUmake gcc'
+required='GNUmake cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/defs.in b/tests/defs.in
index 9bb6333..1d6af76 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -120,6 +120,20 @@ do
       echo "$me: running $MAKE --version -v | grep GNU"
       ( $MAKE --version -v | grep GNU ) || exit 77
       ;;
+    cc)
+      if test x"$CC" = x"no"; then
+        # The user told explicitly it don't want a C compiler to be used.
+        echo "$me: \$CC is \"no\", skipping test"
+        exit 77
+      elif test -z "$CC"; then
+        # The user specified no explicit compiler in its environment, so
+        # we try to force the use of gcc as C compiler.
+        CC=gcc
+        export CC
+        echo "$me: running $CC --version"
+        ( $CC --version ) || exit 77
+      fi
+      ;;
     gcc)
       # When gcc is required, export `CC=gcc' so that ./configure
       # always use it.  This is important only when the user
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 2b4353c..2dca558 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -17,7 +17,7 @@
 # Test to make sure that depcomp is not used when it's not installed
 # From Pavel Roskin.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
@@ -49,5 +49,5 @@ export CFLAGS
 $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
-./configure CC='gcc' 2>error.log
+./configure 2>error.log
 test -z "`cat error.log`"
diff --git a/tests/depcomp3.test b/tests/depcomp3.test
index 2a5db60..95e519c 100755
--- a/tests/depcomp3.test
+++ b/tests/depcomp3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -16,7 +16,7 @@
 
 # Make sure dashmstdout generates dependencies.
 
-required='gcc'
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/depcomp4.test b/tests/depcomp4.test
index 7d22894..f935664 100755
--- a/tests/depcomp4.test
+++ b/tests/depcomp4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -16,7 +16,7 @@
 
 # Test for PR 385: makedepend doesn't work with Libtool.
 
-required='libtoolize gcc makedepend'
+required='libtoolize cc makedepend'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/depend2.test b/tests/depend2.test
index 57d87d7..114664d 100755
--- a/tests/depend2.test
+++ b/tests/depend2.test
@@ -19,7 +19,7 @@
 # --disable-dependency-tracking.
 # Report from Robert Boehne
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/gnits2.test b/tests/gnits2.test
index 4c5d54f..6ec11c6 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2007, 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
@@ -16,7 +17,7 @@
 
 # Test to ensure std-options checking is correct.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 7a08fb8..df09a15 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 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
@@ -16,7 +16,7 @@
 
 # Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/lex3.test b/tests/lex3.test
index 59146c7..0d570b2 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 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
@@ -17,7 +18,7 @@
 # Test associated with PR 19.
 # From Matthew D. Langston.
 
-required='gcc gzip flex GNUmake'
+required='cc gzip flex GNUmake'
 . ./defs || Exit 1
 
 # Ignore user CFLAGS.
diff --git a/tests/lex5.test b/tests/lex5.test
index edbdf9d..ad60b9e 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 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
@@ -16,7 +16,7 @@
 
 # Test for subdir lexers.
 
-required='gcc GNUmake gzip flex'
+required='cc GNUmake gzip flex'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/libobj14.test b/tests/libobj14.test
index ed20703..e017234 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -19,8 +19,7 @@
 # that uses it.
 # Report from Bill Davidson
 
-required=gcc
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
@@ -31,7 +30,7 @@ AM_CONDITIONAL([CASE], :)
 AC_OUTPUT
 EOF
 
-: >bar.c
+: > bar.c  # yes, this is required!
 
 cat >>Makefile.am <<'EOF'
 COMMON_LIBS = @LIBOBJS@
diff --git a/tests/libtool3.test b/tests/libtool3.test
index 3427f28..869c177 100755
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -17,7 +17,7 @@
 # Try to build and package a program linked to a Libtool library.
 # Also make sure we do not bloat the Makefile with unneeded rules.
 
-required='libtoolize gcc'
+required='libtoolize cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/libtool7.test b/tests/libtool7.test
index a2f912f..9df4294 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -17,7 +17,7 @@
 # Make sure we allow Libtool's -dlopen/-dlpreopen
 # Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
 
-required='libtoolize gcc'
+required='libtoolize cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ltcond.test b/tests/ltcond.test
index 0350a3d..7f34599 100755
--- a/tests/ltcond.test
+++ b/tests/ltcond.test
@@ -17,7 +17,7 @@
 # Test for conditional libtool libraries.
 # This combines two examples from the manual.
 
-required='libtoolize gcc'
+required='libtoolize cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
index 1687513..37d8be6 100755
--- a/tests/ltcond2.test
+++ b/tests/ltcond2.test
@@ -16,7 +16,7 @@
 
 # Test for bug in conditionals.
 
-required='libtoolize gcc'
+required='libtoolize cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ltconv.test b/tests/ltconv.test
index 0ec2132..00ca0fc 100755
--- a/tests/ltconv.test
+++ b/tests/ltconv.test
@@ -17,7 +17,7 @@
 # Test for libtool convenience libraries.
 # This example is taken from the manual.
 
-required='libtoolize gcc'
+required='libtoolize cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index 2c9911d..421b6f6 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -16,7 +16,7 @@
 
 # Test to make sure a sensible default source for libraries is used.
 
-required='libtool gcc'
+required='libtool cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/mmodely.test b/tests/mmodely.test
index 0f9bb3b..fda650d 100755
--- a/tests/mmodely.test
+++ b/tests/mmodely.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2004, 2006, 2007, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2007, 2009, 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
@@ -18,7 +19,7 @@
 # sources in maintainer mode.
 # From Derek R. Price.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
@@ -82,7 +83,7 @@ cat >mylex.sh <<'END'
 echo "$@" >lex.yy.c
 END
 chmod +x myyacc.sh mylex.sh
-PATH="`pwd`:$PATH"
+PATH="`pwd`:$PATH" #FIXME: non-portable
 
 # make maintainer-clean; ./configure; make should always work,
 # per GNU Standard.
diff --git a/tests/multlib.test b/tests/multlib.test
index 65b3fd4..f09723b 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 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
@@ -17,11 +17,13 @@
 # Check multilib support.
 # Based on a test case from Ralf Corsepius.
 
-required='gcc GNUmake'
+required='cc GNUmake'
 . ./defs || Exit 1
 
 set -e
 
+test -n "$CC" || Exit 99 # sanity check
+
 cat >configure.in <<'END'
 AC_INIT([multlib], [1.0])
 AC_CONFIG_SRCDIR(libfoo/foo.c)
@@ -33,19 +35,19 @@ AC_CONFIG_SUBDIRS(libbar)
 AC_OUTPUT
 END
 
-cat >mycc <<'END'
+cat >mycc <<END
 #! /bin/sh
-case ${1+"$@"} in
+case \${1+"\$@"} in
  *-print-multi-lib*)
   echo ".;"
   echo "debug;@g"
   exit 0 ;;
 esac
-gcc ${1+"$@"}
+$CC \${1+"\$@"}
 END
 
 chmod +x mycc
-PATH=`pwd`:$PATH
+PATH=`pwd`:$PATH #FIXME: not-portable
 
 cat >Makefile.am <<'EOF'
 SUBDIRS = @subdirs@
diff --git a/tests/nobase.test b/tests/nobase.test
index 8b0dc6e..37db49f 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009  Free
-# Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 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
@@ -17,7 +17,7 @@
 
 # Make sure nobase_* works.
 
-required='gcc'
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr204.test b/tests/pr204.test
index 2944449..96e07cb 100755
--- a/tests/pr204.test
+++ b/tests/pr204.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 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
@@ -17,7 +17,7 @@
 # For PR 204.
 # Sources derived from nodist_ sources should not be distributed.
 
-required='bison gcc'
+required='bison cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr220.test b/tests/pr220.test
index 25e1f0e..7ca668d 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2008, 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
@@ -16,7 +17,7 @@
 
 # Test for PR automake/220.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr224.test b/tests/pr224.test
index fdcb997..e388eff 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 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
@@ -16,7 +16,7 @@
 
 # Test for $(top_srcdir) with dependencies.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 mkdir foo
@@ -51,7 +51,7 @@ $AUTOCONF
 $AUTOMAKE -a
 
 cd build
-CC='gcc' ../configure
+../configure
 $MAKE
 
 test -d foo/.deps
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index 3d2fde5..073d14d 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 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
@@ -17,7 +17,7 @@
 # Make sure that installing subdirectory libraries works.
 # PR/300
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
index 0b226c6..cdd7727 100755
--- a/tests/pr300-prog.test
+++ b/tests/pr300-prog.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2007, 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
@@ -17,7 +17,7 @@
 # Make sure that installing subdirectory programs works.
 # PR/300
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr401.test b/tests/pr401.test
index 7a092bf..adc115e 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 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
@@ -17,7 +17,7 @@
 # Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
 # (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr401c.test b/tests/pr401c.test
index fc2f5de..e45baf0 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 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
@@ -17,7 +17,7 @@
 # Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
 # (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr87.test b/tests/pr87.test
index 369849b..634ca20 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 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
@@ -16,7 +16,7 @@
 
 # Test for PR automake/87.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 subdirs="foo bar"
diff --git a/tests/primary3.test b/tests/primary3.test
index 578d053..5509ed9 100755
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -16,7 +16,7 @@
 
 # Make sure we can build programs ending in `.la'
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/specflg7.test b/tests/specflg7.test
index 067a36d..b1593b0 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 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
@@ -16,7 +16,7 @@
 
 # The true/false example from the manual, plus a check for _SHORTNAME.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 1abcaa2..411a096 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 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
@@ -18,7 +18,7 @@
 # with one extra indirection in the sources (PR/315), and
 # use of _CPPFLAGS (PR/337).
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subdir5.test b/tests/subdir5.test
index 2f0113b..2e4da59 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2009, 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
@@ -22,7 +22,7 @@
 
 # This test assumes that the `make' utility is able to start
 # over and reload Makefiles which have been remade (a non-POSIX feature).
-required='GNUmake gcc'
+required='GNUmake cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subdir8.test b/tests/subdir8.test
index bc3043e..f6bed0d 100755
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2009, 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
@@ -21,7 +21,7 @@
 
 # This test assumes that the `make' utility is able to start
 # over and reload Makefiles which have been remade (a non-POSIX feature).
-required='GNUmake gcc'
+required='GNUmake cc'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subobj10.test b/tests/subobj10.test
index c9c129d..0716f7d 100755
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -16,7 +16,7 @@
 
 # PR 492: Test asm subdir-objects.
 
-required=gcc  # avoid compiler errors.
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subobj3.test b/tests/subobj3.test
index a4ba765..a21c6a0 100755
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 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
@@ -17,7 +17,7 @@
 
 # Test of subdir objects with C++.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
@@ -55,8 +55,6 @@ END
 CFLAGS=
 export CFLAGS
 
-# We use gcc and not gcc -traditional as the latter fails on some
-# Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
diff --git a/tests/subobj6.test b/tests/subobj6.test
index 42b6e14..4d03650 100755
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 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
@@ -17,7 +18,7 @@
 # Test of subdir make distclean rules.
 # From Robert Collins
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/subpkg.test b/tests/subpkg.test
index 3662937..5571bce 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2006, 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
@@ -16,7 +17,7 @@
 
 # Check subpackage handling.
 
-required='gcc bison'
+required='cc bison'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/substre2.test b/tests/substre2.test
index ffe9e8b..3479841 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -17,7 +17,7 @@
 # Test for bug in variable substitution references, where
 # undefined variables break later substitutions.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/substref.test b/tests/substref.test
index 3d4da05..adc3c5c 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -18,7 +18,7 @@
 # pattern is null.
 # Report from Richard Boulton
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/suffix8.test b/tests/suffix8.test
index 70ff3a5..21b1932 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -17,7 +17,7 @@
 # Test to make sure Automake supports multiple derivations for the same suffix.
 # PR/37
 
-required='gcc libtoolize'
+required='cc libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index d0f83f3..4a399bb 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 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
@@ -17,7 +18,7 @@
 # Test to make sure target specific CFLAGS work
 # Assar Westerlund <address@hidden>
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/targetclash.test b/tests/targetclash.test
index 0433b41..de3324c 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -16,7 +16,7 @@
 
 # Check that target clashes are diagnosed.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/transform.test b/tests/transform.test
index 02fdd61..d9aa072 100755
--- a/tests/transform.test
+++ b/tests/transform.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008  Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 2004, 2007, 2008, 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
@@ -17,7 +17,7 @@
 
 # Make sure that --program-transform works.
 
-required=gcc
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/yacc4.test b/tests/yacc4.test
index 0435ec0..40361c3 100755
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -16,7 +16,7 @@
 
 # Some simple tests of ylwrap functionality.
 
-required='bison gcc'
+required='bison cc'
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/yacc6.test b/tests/yacc6.test
index f10effd..d092750 100755
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007  Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2010 Free Software
 # Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 # Report from Tim Van Holder.
 # Also make sure depcomp does not needlessly update headers.
 # Report from Paolo Bonzini.
+# Keep this in sync with sister test 'yacc9.test'.
 
 required='gcc bison GNUmake'
 . ./defs || Exit 1
diff --git a/tests/yacc8.test b/tests/yacc8.test
index 979415c..9a8205f 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2006, 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
@@ -16,7 +17,7 @@
 
 # Test for subdir parsers.
 
-required="gcc bison"
+required="cc bison"
 
 . ./defs || Exit 1
 
diff --git a/tests/yacc9.test b/tests/yacc9.test
new file mode 100755
index 0000000..741379b
--- /dev/null
+++ b/tests/yacc9.test
@@ -0,0 +1,109 @@
+#! /bin/sh
+# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 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/>.
+
+# Test to make sure ylwrap put in right location.
+# Report from Tim Van Holder.
+# Also make sure depcomp does not needlessly update headers.
+# Report from Paolo Bonzini.
+# Keep this in sync with sister test 'yacc6.test'.
+
+required='cc bison GNUmake'
+. ./defs || Exit 1
+
+set -e
+
+cat > configure.in << 'END'
+AC_INIT([yacc6], [1.0])
+AC_CONFIG_AUX_DIR([aux1])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_YACC
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+
+test-time-unchanged:
+       test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = z
+test-time-changed:
+       test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = sub/main.$(OBJEXT)
+END
+
+mkdir aux1 sub
+
+cat > sub/Makefile.am << 'END'
+bin_PROGRAMS = foo bar
+AM_YFLAGS = -d
+foo_SOURCES = foo.y main.c
+foo_CPPFLAGS = -DFOO
+bar_SOURCES = bar.y main.c
+BUILT_SOURCES = foo.h bar.h
+END
+
+cat > sub/foo.y << 'END'
+%{
+int yylex () {return 0;}
+void yyerror (char *s) {}
+%}
+%token TOKEN
+%%
+foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};
+END
+
+cp sub/foo.y sub/bar.y
+
+cat >sub/main.c <<'EOF'
+#ifdef FOO
+#  include "foo.h"
+#else
+#  include "bar.h"
+#endif
+
+int
+main()
+{
+  return 0;
+}
+EOF
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+test -f aux1/ylwrap
+test ! -f ylwrap
+test ! -f sub/ylwrap
+$FGREP '(top_srcdir)/aux1/ylwrap' sub/Makefile.in
+./configure --enable-dependency-tracking
+$MAKE
+grep '#.*line.*foo.y' sub/foo.c
+grep '#.*line.*bar.y' sub/bar.c
+
+$sleep
+: > z
+$sleep
+touch sub/bar.y
+$MAKE
+$MAKE test-time-unchanged
+$sleep
+sed s/TOKEN/TEKON/g sub/bar.y >sub/bar.yt
+mv -f sub/bar.yt sub/bar.y
+$MAKE
+$MAKE test-time-changed
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 6db5fd7..f1596cf 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -20,7 +20,7 @@
 # `make' and `make distdir' and check whether the version of `parse.c'
 # to be distributed is up to date.
 
-required='gcc bison'
+required='cc bison'
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
-- 
1.6.5

From 1cb5a0e58889cf0d0b845691540c9d090d253249 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Wed, 23 Jun 2010 00:30:46 +0200
Subject: [PATCH 2/3] Do not SKIP a test on a command failing with `77' exit 
status.

When, in a test script using the `errexit' (`-e') shell flag,
a command failed with status `77' the global test outcome was
considered a SKIP, bacause the a value of `77' for `$?' was
passed to the exit trap.  This could happen in practice, as an
autoconf-generated configure script exits with status `77' if
it fails to find e.g. a required compiler.  This patch modify
the exit trap, so that only an explicit `Exit 77' makes the
test outcome be considered a SKIP.

* tests/defs.in ($am_test_skipped): New variable, initialized
to "no".
(Exit): Set $am_test_skipped to "yes" if passed an exit status
of 77.
(trap '...' 0): Reset exit status to `1' if it is = `77', but
$am_test_skipped is not set to "yes".
* tests/upc.test: Skip it explicitly if ./configure exit with
status 77.
* tests/upc3.test: Likewise.
---
 ChangeLog       |   21 +++++++++++++++++++++
 tests/defs.in   |    9 +++++++++
 tests/upc.test  |    4 +++-
 tests/upc3.test |    4 +++-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6e8a39..9fbf54f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,25 @@
 2010-06-23  Stefano Lattarini  <address@hidden>
+
+       Do not SKIP a test on a command failing with `77' exit status.
+       When, in a test script using the `errexit' (`-e') shell flag,
+       a command failed with status `77' the global test outcome was
+       considered a SKIP, bacause the a value of `77' for `$?' was
+       passed to the exit trap.  This could happen in practice, as an
+       autoconf-generated configure script exits with status `77' if
+       it fails to find e.g. a required compiler.  This patch modify
+       the exit trap, so that only an explicit `Exit 77' makes the
+       test outcome be considered a SKIP.
+       * tests/defs.in ($am_test_skipped): New variable, initialized
+       to "no".
+       (Exit): Set $am_test_skipped to "yes" if passed an exit status
+       of 77.
+       (trap '...' 0): Reset exit status to `1' if it is = `77', but
+       $am_test_skipped is not set to "yes".
+       * tests/upc.test: Skip it explicitly if ./configure exit with
+       status 77.
+       * tests/upc3.test: Likewise.
+
+2010-06-23  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
        New requirement "cc" for tests using a C compiler.
diff --git a/tests/defs.in b/tests/defs.in
index 1d6af76..3fef7b1 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -254,6 +254,11 @@ case "$srcdir" in
     ;;
 esac
 
+# This is to ensure that a test script does not result as a SKIP
+# just because a command in it happens to exit with status 77 when
+# the `errexit' (aka `set -e') shell flag is active.
+am_test_skipped=no
+
 # We use a trap below for cleanup.  This requires us to go through
 # hoops to get the right exit status transported through the signal.
 # So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
@@ -262,6 +267,7 @@ esac
 Exit ()
 {
   set +e
+  test 77 = $1 && am_test_skipped=yes
   (exit $1)
   exit $1
 }
@@ -278,6 +284,9 @@ address@hidden@
 if test "$sh_errexit_works" = yes; then
   trap 'exit_status=$?
     set +e
+    if test $exit_status -eq 77 && test x"$am_test_skipped" != x"yes"; then
+      exit_status=1
+    fi
     cd "$curdir"
     case $exit_status,$keep_testdirs in
     0,)
diff --git a/tests/upc.test b/tests/upc.test
index 3c55ccb..725166c 100755
--- a/tests/upc.test
+++ b/tests/upc.test
@@ -45,5 +45,7 @@ $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
 
-./configure
+# Skip the test if configure suggests so.
+./configure || Exit $?
+
 $MAKE distcheck
diff --git a/tests/upc3.test b/tests/upc3.test
index f575b9a..870c66e 100755
--- a/tests/upc3.test
+++ b/tests/upc3.test
@@ -60,5 +60,7 @@ $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
 
-./configure
+# Skip the test if configure suggests so.
+./configure || Exit $?
+
 $MAKE distcheck
-- 
1.6.5

From 12c4ee551486fb06e38c1bdbf693f61f6df31b3c Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Wed, 23 Jun 2010 08:47:38 +0200
Subject: [PATCH 3/3] Make sure all tests needing C compiler require it 
explicitly.

The list of the test scripts which needed a C compiler but
failed to require it explicitly was found by running (in the
`tests/' directory):
  $ CC=no make check -j24
and seeing which tests reported FAIL instead of SKIP.
After the present change, all those previously failing tests
correctly report SKIP.

* tests/aclocal4.test ($required): Add `cc'.
* tests/ansi.test: Likewise.
* tests/check5.test: Likewise.
* tests/check6.test: Likewise.
* tests/check7.test: Likewise.
* tests/check8.test: Likewise.
* tests/check9.test: Likewise.
* tests/cond11.test: Likewise.
* tests/cond21.test: Likewise.
* tests/cond22.test: Likewise.
* tests/cond30.test: Likewise.
* tests/cond31.test: Likewise.
* tests/cond32.test: Likewise.
* tests/cond34.test: Likewise.
* tests/cond39.test: Likewise.
* tests/cond5.test: Likewise.
* tests/condd.test: Likewise.
* tests/depcomp6.test: Likewise.
* tests/depcomp7.test: Likewise.
* tests/depend5.test: Likewise.
* tests/distcleancheck.test: Likewise.
* tests/distname.test: Likewise.
* tests/exeext.test: Likewise.
* tests/exeext4.test: Likewise.
* tests/instdir-ltlib.test: Likewise.
* tests/instdir-prog.test: Likewise.
* tests/instfail-libtool.test: Likewise.
* tests/instfail.test: Likewise.
* tests/lflags.test: Likewise.
* tests/libtoo10.test: Likewise.
* tests/libtoo11.test: Likewise.
* tests/ltorder.test: Likewise.
* tests/nostdinc.test: Likewise.
* tests/parallel-tests4.test: Likewise.
* tests/parallel-tests5.test: Likewise.
* tests/parallel-tests7.test: Likewise.
* tests/pr287.test: Likewise.
* tests/regex.test: Likewise.
* tests/silent.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silentlex.test: Likewise.
* tests/silentyacc.test: Likewise.
* tests/specflg10.test: Likewise.
* tests/stdinc.test: Likewise.
* tests/strip.test: Likewise.
* tests/subdirbuiltsources.test: Likewise.
* tests/subobj5.test: Likewise.
* tests/subst2.test: Likewise.
* tests/suffix10.test: Likewise.
* tests/suffix11.test: Likewise.
* tests/suffix12.test: Likewise.
* tests/suffix13.test: Likewise.
* tests/transform2.test: Likewise.
* tests/upc.test: Likewise.
* tests/upc3.test: Likewise.
* tests/vala4.test: Likewise.
* tests/yacc7.test: Likewise.
* tests/yflags.test: Likewise.
---
 ChangeLog                     |   69 +++++++++++++++++++++++++++++++++++++++++
 tests/aclocal4.test           |    4 +-
 tests/ansi.test               |    1 +
 tests/check5.test             |    1 +
 tests/check6.test             |    3 +-
 tests/check7.test             |    3 +-
 tests/check8.test             |    1 +
 tests/check9.test             |    1 +
 tests/cond11.test             |    3 +-
 tests/cond21.test             |    3 +-
 tests/cond22.test             |    3 +-
 tests/cond30.test             |    5 ++-
 tests/cond31.test             |    5 ++-
 tests/cond32.test             |    5 ++-
 tests/cond34.test             |    5 ++-
 tests/cond39.test             |    3 +-
 tests/cond5.test              |    4 ++-
 tests/condd.test              |    3 +-
 tests/depcomp6.test           |    3 +-
 tests/depcomp7.test           |    4 +-
 tests/depend5.test            |    3 +-
 tests/distcleancheck.test     |    3 +-
 tests/distname.test           |    3 +-
 tests/exeext.test             |    1 +
 tests/exeext4.test            |    1 +
 tests/instdir-ltlib.test      |    4 +-
 tests/instdir-prog.test       |    3 +-
 tests/instfail-libtool.test   |    4 +-
 tests/instfail.test           |    3 +-
 tests/lflags.test             |    1 +
 tests/libtoo10.test           |    4 +-
 tests/libtoo11.test           |    4 +-
 tests/ltorder.test            |    4 +-
 tests/nostdinc.test           |    1 +
 tests/parallel-tests4.test    |    1 +
 tests/parallel-tests5.test    |    2 +-
 tests/parallel-tests7.test    |    1 +
 tests/pr287.test              |    3 +-
 tests/regex.test              |    3 +-
 tests/silent.test             |    3 +-
 tests/silent3.test            |    2 +-
 tests/silent5.test            |    2 +-
 tests/silent9.test            |    2 +-
 tests/silentlex.test          |    2 +-
 tests/silentyacc.test         |    2 +-
 tests/specflg10.test          |    4 +-
 tests/stdinc.test             |    3 +-
 tests/strip.test              |    1 +
 tests/subdirbuiltsources.test |    3 +-
 tests/subobj5.test            |    3 +-
 tests/subst2.test             |    3 +-
 tests/suffix10.test           |    2 +-
 tests/suffix11.test           |    1 +
 tests/suffix12.test           |    1 +
 tests/suffix13.test           |    1 +
 tests/transform2.test         |    4 ++-
 tests/upc.test                |    3 +-
 tests/upc3.test               |    3 +-
 tests/vala4.test              |    4 +-
 tests/yacc7.test              |    5 ++-
 tests/yflags.test             |    1 +
 61 files changed, 174 insertions(+), 59 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9fbf54f..0fa9010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,74 @@
 2010-06-23  Stefano Lattarini  <address@hidden>
 
+       Make sure all tests needing C compiler require it explicitly.
+       The list of the test scripts which needed a C compiler but
+       failed to require it explicitly was found by running (in the
+       `tests/' directory):
+         $ CC=no make check -j24
+       and seeing which tests reported FAIL instead of SKIP.
+       After the present change, all those previously failing tests
+       correctly report SKIP.
+       * tests/aclocal4.test ($required): Add `cc'.
+       * tests/ansi.test: Likewise.
+       * tests/check5.test: Likewise.
+       * tests/check6.test: Likewise.
+       * tests/check7.test: Likewise.
+       * tests/check8.test: Likewise.
+       * tests/check9.test: Likewise.
+       * tests/cond11.test: Likewise.
+       * tests/cond21.test: Likewise.
+       * tests/cond22.test: Likewise.
+       * tests/cond30.test: Likewise.
+       * tests/cond31.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/cond34.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/cond5.test: Likewise.
+       * tests/condd.test: Likewise.
+       * tests/depcomp6.test: Likewise.
+       * tests/depcomp7.test: Likewise.
+       * tests/depend5.test: Likewise.
+       * tests/distcleancheck.test: Likewise.
+       * tests/distname.test: Likewise.
+       * tests/exeext.test: Likewise.
+       * tests/exeext4.test: Likewise.
+       * tests/instdir-ltlib.test: Likewise.
+       * tests/instdir-prog.test: Likewise.
+       * tests/instfail-libtool.test: Likewise.
+       * tests/instfail.test: Likewise.
+       * tests/lflags.test: Likewise.
+       * tests/libtoo10.test: Likewise.
+       * tests/libtoo11.test: Likewise.
+       * tests/ltorder.test: Likewise.
+       * tests/nostdinc.test: Likewise.
+       * tests/parallel-tests4.test: Likewise.
+       * tests/parallel-tests5.test: Likewise.
+       * tests/parallel-tests7.test: Likewise.
+       * tests/pr287.test: Likewise.
+       * tests/regex.test: Likewise.
+       * tests/silent.test: Likewise.
+       * tests/silent3.test: Likewise.
+       * tests/silent5.test: Likewise.
+       * tests/silent9.test: Likewise.
+       * tests/silentlex.test: Likewise.
+       * tests/silentyacc.test: Likewise.
+       * tests/specflg10.test: Likewise.
+       * tests/stdinc.test: Likewise.
+       * tests/strip.test: Likewise.
+       * tests/subdirbuiltsources.test: Likewise.
+       * tests/subobj5.test: Likewise.
+       * tests/subst2.test: Likewise.
+       * tests/suffix10.test: Likewise.
+       * tests/suffix11.test: Likewise.
+       * tests/suffix12.test: Likewise.
+       * tests/suffix13.test: Likewise.
+       * tests/transform2.test: Likewise.
+       * tests/upc.test: Likewise.
+       * tests/upc3.test: Likewise.
+       * tests/vala4.test: Likewise.
+       * tests/yacc7.test: Likewise.
+       * tests/yflags.test: Likewise.
+
        Do not SKIP a test on a command failing with `77' exit status.
        When, in a test script using the `errexit' (`-e') shell flag,
        a command failed with status `77' the global test outcome was
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index 9fa96ec..907890a 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -18,7 +18,7 @@
 # Report from Jim Meyering.
 
 # We need GNU make for the `rebuild rules' to be triggered.
-required=GNUmake
+required='cc GNUmake'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/ansi.test b/tests/ansi.test
index c0778c6..6b95561 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -18,6 +18,7 @@
 # Test for bug where ansi2knr.c is not included in distribution.
 # From François Pinard.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/check5.test b/tests/check5.test
index 7113e1b..79863ca 100755
--- a/tests/check5.test
+++ b/tests/check5.test
@@ -17,6 +17,7 @@
 
 # Test TESTS = $(check_PROGRAMS)
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/check6.test b/tests/check6.test
index e32499c..2d5de5a 100755
--- a/tests/check6.test
+++ b/tests/check6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -17,6 +17,7 @@
 # Test for PR 400: XFAIL_TESTS delimited by TABs.
 # Also test that Solaris make VPATH rewriting is honored
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/check7.test b/tests/check7.test
index 1653a8d..9e9b18d 100755
--- a/tests/check7.test
+++ b/tests/check7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -16,6 +16,7 @@
 
 # Check EXEEXT extension for XFAIL_TESTS.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/check8.test b/tests/check8.test
index dc8d3dd..9fcebe8 100755
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -16,6 +16,7 @@
 
 # Check subdir TESTS.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/check9.test b/tests/check9.test
index c80d780..62d4d50 100755
--- a/tests/check9.test
+++ b/tests/check9.test
@@ -18,6 +18,7 @@
 # Note that in this test, we rely on the .test extension for the
 # substituted names: this is necessary for parallel-tests.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/cond11.test b/tests/cond11.test
index 15c6c2a..e243753 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -18,6 +18,7 @@
 # This checks that, if LDADD is set from a conditional variable
 # and an AC_SUBST, the _DEPENDENCIES variable is set correctly.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/cond21.test b/tests/cond21.test
index 160c76f..87dcba4 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 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
@@ -16,6 +16,7 @@
 
 # Check for use of = and += in different conditions.
 
+required=cc
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/cond22.test b/tests/cond22.test
index 4ef1967..804af21 100755
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 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
@@ -17,6 +17,7 @@
 # Regression test for bug when sources listed in conditional.
 # Report from Richard Boulton.  PR/326.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/cond30.test b/tests/cond30.test
index e092c45..6c050f5 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
@@ -16,7 +16,8 @@
 
 # For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond31.test b/tests/cond31.test
index 4975ef4..47cffc7 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -16,7 +16,8 @@
 
 # Make sure we define conditional _DEPENDENCIES correctly.
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond32.test b/tests/cond32.test
index ae5c8c6..63114ab 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 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
@@ -16,7 +16,8 @@
 
 # Make sure the user can override a conditional _DEPENDENCIES.
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond34.test b/tests/cond34.test
index 9e42eea..6bad520 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -17,7 +17,8 @@
 # Check for _DEPDENDENCIES definition with conditional _LDADD.
 # Report from Elena A. Vengerova
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/cond39.test b/tests/cond39.test
index 8d96595..5a2eca4 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -20,7 +20,8 @@
 
 # Build either as CONFIG_FILE or as PROGRAM.
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 set -e
 
 mkdir sub
diff --git a/tests/cond5.test b/tests/cond5.test
index 531cda8..3a8192b 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 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
@@ -16,6 +17,7 @@
 
 # Yet another sources-in-conditional test.  Report from Tim Goodwin.
 
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/condd.test b/tests/condd.test
index 0e9b6e8..5cfe5be 100755
--- a/tests/condd.test
+++ b/tests/condd.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 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
@@ -16,6 +16,7 @@
 
 # Test for bug in conditionals.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/depcomp6.test b/tests/depcomp6.test
index 0b6a7f5..f46904a 100755
--- a/tests/depcomp6.test
+++ b/tests/depcomp6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -16,6 +16,7 @@
 
 # Check dependency generation (non libtool case).
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/depcomp7.test b/tests/depcomp7.test
index 67702c7..b25d8d4 100755
--- a/tests/depcomp7.test
+++ b/tests/depcomp7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 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
@@ -16,7 +16,7 @@
 
 # Check dependency generation (libtool case).
 
-required='libtoolize'
+required='cc libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/depend5.test b/tests/depend5.test
index 0d9be3b..9c71f1a 100755
--- a/tests/depend5.test
+++ b/tests/depend5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 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
@@ -17,6 +17,7 @@
 # Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
 # quoting in $CONFIG_FILES, done by newer Autoconf.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
index 8603329..3b32315 100755
--- a/tests/distcleancheck.test
+++ b/tests/distcleancheck.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 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
@@ -17,6 +17,7 @@
 # Make sure the suggested `distcleancheck_listfiles' in the manual works.
 # The example Makefile.am we use is from the FAQ entry `distcleancheck'.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/distname.test b/tests/distname.test
index 6c18608..75a9707 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 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
@@ -17,6 +17,7 @@
 # Test of names in tar file.
 # From Rainer Orth
 
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/exeext.test b/tests/exeext.test
index 3fd42a8..5784954 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -21,6 +21,7 @@
 # Also make sure the old definitions of bin_PROGRAMS and friend
 # aren't left around.  Report from Jim Meyering.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/exeext4.test b/tests/exeext4.test
index e6cfe7d..0d995fa 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -17,6 +17,7 @@
 # Make sure $(EXEEXT) is appended to programs and to tests that are
 # programs, but not to @address@hidden
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/instdir-ltlib.test b/tests/instdir-ltlib.test
index 1fb4f37..c651373 100755
--- a/tests/instdir-ltlib.test
+++ b/tests/instdir-ltlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -17,7 +17,7 @@
 # If $(libdir) is the empty string, then nothing should be installed there.
 # This test exercises the libtool code paths.
 
-required=libtoolize
+required='cc libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/instdir-prog.test b/tests/instdir-prog.test
index 6a73b75..789d9be 100755
--- a/tests/instdir-prog.test
+++ b/tests/instdir-prog.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -17,6 +17,7 @@
 # If $(bindir) is the empty string, then nothing should be installed there.
 # This test exercises the prog and libs code paths.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/instfail-libtool.test b/tests/instfail-libtool.test
index 1e756a6..a3e2259 100755
--- a/tests/instfail-libtool.test
+++ b/tests/instfail-libtool.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -19,7 +19,7 @@
 
 # This is the libtool sister test of instfail.test
 
-required='libtool libtoolize'
+required='cc libtool libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/instfail.test b/tests/instfail.test
index 38a1c9c..968b561 100755
--- a/tests/instfail.test
+++ b/tests/instfail.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -19,6 +19,7 @@
 
 # This test has a few sister tests, for java, info, libtool.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/lflags.test b/tests/lflags.test
index 97de608..d677e76 100755
--- a/tests/lflags.test
+++ b/tests/lflags.test
@@ -19,6 +19,7 @@
 # Please keep this in sync with the sister tests lflags2.test, yflags.test
 # and yflags2.test
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/libtoo10.test b/tests/libtoo10.test
index 51a68d4..718b30d 100755
--- a/tests/libtoo10.test
+++ b/tests/libtoo10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009, 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
@@ -17,7 +17,7 @@
 # Make sure .libs directories are removed for _PROGRAMS.
 # Report from Guillermo Ontañón.
 
-required=libtoolize
+required='cc libtoolize'
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/libtoo11.test b/tests/libtoo11.test
index 850ca82..14bd3a6 100755
--- a/tests/libtoo11.test
+++ b/tests/libtoo11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -17,7 +17,7 @@
 # Make sure config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
 # Report by Charles Wilson.
 
-required=libtoolize
+required='cc libtoolize'
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/ltorder.test b/tests/ltorder.test
index 0f69211..0eb4db8 100755
--- a/tests/ltorder.test
+++ b/tests/ltorder.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 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
@@ -16,7 +16,7 @@
 
 # Test for correct installation order of nobase libtool libraries.
 
-required='libtoolize'
+required='cc libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 43535ef..6bb4c20 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -16,6 +16,7 @@
 
 # Test to make sure nostdinc option works correctly.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/parallel-tests4.test b/tests/parallel-tests4.test
index efe7e8d..8540af9 100755
--- a/tests/parallel-tests4.test
+++ b/tests/parallel-tests4.test
@@ -18,6 +18,7 @@
 # - suffix rules
 
 parallel_tests=yes
+required=cc
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/parallel-tests5.test b/tests/parallel-tests5.test
index c4ff5b9..9cb24f4 100755
--- a/tests/parallel-tests5.test
+++ b/tests/parallel-tests5.test
@@ -21,7 +21,7 @@
 # It merely serves as demonstration.  :-)
 
 parallel_tests=yes
-required=GNUmake
+required='cc GNUmake'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/parallel-tests7.test b/tests/parallel-tests7.test
index d01ada1..de91bc4 100755
--- a/tests/parallel-tests7.test
+++ b/tests/parallel-tests7.test
@@ -18,6 +18,7 @@
 # - per-extension test drivers
 
 parallel_tests=yes
+required=cc
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/pr287.test b/tests/pr287.test
index 58553b5..77c808f 100755
--- a/tests/pr287.test
+++ b/tests/pr287.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 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
@@ -16,6 +16,7 @@
 
 # Test for PR 287: empty SUBDIRS.
 
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/regex.test b/tests/regex.test
index babd92a..a57a2e0 100755
--- a/tests/regex.test
+++ b/tests/regex.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 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
@@ -16,6 +16,7 @@
 
 # Make sure AM_WITH_REGEX compiles and runs.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/silent.test b/tests/silent.test
index c91115c..db7919e 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -18,7 +18,8 @@
 
 # Please keep this file in sync with silent2.test.
 
-. ./defs
+required=cc
+. ./defs || Exit 1
 
 set -e
 
diff --git a/tests/silent3.test b/tests/silent3.test
index d0a0131..4a2f9af 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -18,7 +18,7 @@
 
 # Please keep this file in sync with silent4.test and silent9.test.
 
-required=libtoolize
+required='cc libtoolize'
 . ./defs
 
 set -e
diff --git a/tests/silent5.test b/tests/silent5.test
index e1134e8..b01df28 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -20,7 +20,7 @@
 # remove this test script.
 
 # FIXME: generic C++/Fortran compilers should suffice here
-required='g++ gfortran flex bison'
+required='cc g++ gfortran flex bison'
 . ./defs
 
 set -e
diff --git a/tests/silent9.test b/tests/silent9.test
index 11375f8..27fb492 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -18,7 +18,7 @@
 
 # Please keep this file in sync with silent3.test and silent4.test.
 
-required="libtoolize"
+required='cc libtoolize'
 . ./defs
 
 set -e
diff --git a/tests/silentlex.test b/tests/silentlex.test
index 78e0c7d..57936f4 100755
--- a/tests/silentlex.test
+++ b/tests/silentlex.test
@@ -16,7 +16,7 @@
 
 # Check silent-rules mode for Lex.
 
-required='flex'
+required='cc flex'
 . ./defs
 
 set -e
diff --git a/tests/silentyacc.test b/tests/silentyacc.test
index ac5f061..336707d 100755
--- a/tests/silentyacc.test
+++ b/tests/silentyacc.test
@@ -16,7 +16,7 @@
 
 # Check silent-rules mode for Yacc.
 
-required='bison'
+required='cc bison'
 . ./defs
 
 set -e
diff --git a/tests/specflg10.test b/tests/specflg10.test
index efe13f5..76eb346 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 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
@@ -16,7 +16,7 @@
 
 # AM_DEFAULT_SOURCE_EXT
 
-required=g++
+required='cc g++'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/stdinc.test b/tests/stdinc.test
index ff914f3..b52ed5f 100755
--- a/tests/stdinc.test
+++ b/tests/stdinc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2007  Free Software Foundation, Inc.
+# Copyright (C) 2007, 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
@@ -17,6 +17,7 @@
 # Test to make sure the standard include order is stable.
 # Report by Kent Boortz.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/strip.test b/tests/strip.test
index 12fe6b4..ed1dbad 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -16,6 +16,7 @@
 
 # Test for install-strip.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
index 8fe506a..c3299b0 100755
--- a/tests/subdirbuiltsources.test
+++ b/tests/subdirbuiltsources.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -18,6 +18,7 @@
 # A bug occurred where subdirs do not have all-recursive or
 # all-recursive-am which depended on BUILT_SOURCES.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/subobj5.test b/tests/subobj5.test
index 9c9568a..5049c42 100755
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 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
@@ -17,6 +17,7 @@
 # Test of subdir make dist rules.
 # From Robert Collins
 
+required=cc
 . ./defs || Exit 1
 
 cat > configure.in << 'END'
diff --git a/tests/subst2.test b/tests/subst2.test
index 2bbabdd..25d0719 100755
--- a/tests/subst2.test
+++ b/tests/subst2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 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
@@ -16,6 +16,7 @@
 
 # Make sure a multi-line definition cannot be terminated by an empty
 # line (when there are @substitutions@ inside).
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/suffix10.test b/tests/suffix10.test
index 131359c..e5ca0d4 100755
--- a/tests/suffix10.test
+++ b/tests/suffix10.test
@@ -17,7 +17,7 @@
 # Make sure that derivations work with .lo too.
 # (related to PR/37)
 
-required='libtoolize bison'
+required='cc libtoolize bison'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/suffix11.test b/tests/suffix11.test
index 91d2cf4..5d926ab 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -18,6 +18,7 @@
 # PR/371 and PR/372: Reported by Duncan Gibson.
 # We also check for suffixes containing `-'.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/suffix12.test b/tests/suffix12.test
index 21089a5..a6f03e5 100755
--- a/tests/suffix12.test
+++ b/tests/suffix12.test
@@ -17,6 +17,7 @@
 # Tests that Automake understands suffix rules with subdir objects.
 # Reported by John Ratliff.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 2b39460..719ed12 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -23,6 +23,7 @@
 # and subdir objects.
 # Reported by Florian Briegel.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/transform2.test b/tests/transform2.test
index 0f9d5ec..0e1d1a6 100755
--- a/tests/transform2.test
+++ b/tests/transform2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2007, 2008, 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
@@ -17,6 +18,7 @@
 # Make sure that --program-transform works even when multiple files are
 # collapsed.
 
+required=cc
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/upc.test b/tests/upc.test
index 725166c..542361c 100755
--- a/tests/upc.test
+++ b/tests/upc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -16,6 +16,7 @@
 
 # A simple Hello World for UPC.
 
+required=cc
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/upc3.test b/tests/upc3.test
index 870c66e..32e3119 100755
--- a/tests/upc3.test
+++ b/tests/upc3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -16,6 +16,7 @@
 
 # Test that C and Unified Parallel C link safely.
 
+required=cc
 . ./defs || Exit 1
 set -e
 
diff --git a/tests/vala4.test b/tests/vala4.test
index 7a15ebe..086a7d7 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -20,7 +20,7 @@
 
 # Test AM_PROG_VALAC.
 
-required=libtoolize
+required='cc libtoolize'
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/yacc7.test b/tests/yacc7.test
index 2edd15c..591a679 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 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
@@ -20,7 +21,7 @@
 # Also check that the sources of the generated parser are distributed.
 # PR/47.
 
-required=bison
+required='cc bison'
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/yflags.test b/tests/yflags.test
index fcb0c64..eefdefe 100755
--- a/tests/yflags.test
+++ b/tests/yflags.test
@@ -19,6 +19,7 @@
 # Please keep this in sync with the sister tests yflags2.test, lflags.test
 # and lflags2.test
 
+required=cc
 . ./defs || Exit 1
 
 set -e
-- 
1.6.5


reply via email to

[Prev in Thread] Current Thread [Next in Thread]