summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-05-10 14:32:27 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-05-10 14:32:27 +0200
commit9c86ba6b75fc09d48e5c8b8c6f1178147430efed (patch)
tree3811a8af995615a0ef4e9fa54f25acd913f31d27
parent33c59ec5252efb1021b2e52a8cad40918670362b (diff)
downloadautomake-9c86ba6b75fc09d48e5c8b8c6f1178147430efed.tar.gz
tests: add few missing 'cc' and 'c++' requirements
Without that requirements, the configure-time overrides of CC and CXX wouldn't be honored in the affected tests. * t/silent-yacc.sh ($required): Require 'cc'. * t/silent-yacc-headers.sh: Likewise. * t/silent-lex.sh: Likewise. * t/lex-clean.sh: Likewise. * t/lex-depend.sh: Likewise. * t/lex-line.sh: Likewise. * t/lex-depend.sh: Likewise. * t/lex-pr204.sh: Likewise. * t/yacc-deleted-headers.sh: Likewise. * t/yacc-line.sh: Likewise. * t/yacc-depend.sh: Likewise. * t/yacc-depend2.sh: Likewise. * t/yacc-dist-nobuild-subdir.sh: Likewise. * t/yacc-bison-skeleton.sh: Likewise. * t/yacc-bison-skeleton-cxx.sh ($required): Require 'c++'. * t/yacc-clean-cxx.sh: Likewise. * t/yacc-d-cxx.sh: Likewise. * t/yacc-cxx.sh: Likewise. * t/yacc-mix-c-cxx.sh ($required): Require 'cc' and 'c++'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rwxr-xr-xt/lex-clean.sh2
-rwxr-xr-xt/lex-depend.sh2
-rwxr-xr-xt/lex-line.sh2
-rwxr-xr-xt/lex-nodist.sh2
-rwxr-xr-xt/lex-pr204.sh2
-rwxr-xr-xt/silent-lex.sh2
-rwxr-xr-xt/silent-yacc-headers.sh2
-rwxr-xr-xt/silent-yacc.sh2
-rwxr-xr-xt/yacc-bison-skeleton-cxx.sh2
-rwxr-xr-xt/yacc-bison-skeleton.sh2
-rwxr-xr-xt/yacc-clean-cxx.sh2
-rwxr-xr-xt/yacc-cxx.sh2
-rwxr-xr-xt/yacc-d-cxx.sh2
-rwxr-xr-xt/yacc-deleted-headers.sh2
-rwxr-xr-xt/yacc-depend.sh2
-rwxr-xr-xt/yacc-depend2.sh2
-rwxr-xr-xt/yacc-dist-nobuild-subdir.sh2
-rwxr-xr-xt/yacc-line.sh2
-rwxr-xr-xt/yacc-mix-c-cxx.sh2
19 files changed, 19 insertions, 19 deletions
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 42131954d..18cf32e4d 100755
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -19,7 +19,7 @@
# distributed .l sources are cleaned by "make maintainer-clean".
# See also sister test 'lex-clean-cxx.test'.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 9487f4a5c..fce198db2 100755
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -17,7 +17,7 @@
# Test to make sure automatic dependency tracking work with Lex/C.
# Test suggested by PR automake/6.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 05b6f9999..f690e7e7a 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -19,7 +19,7 @@
# 'subdir-object' option enabled.
# See also sister test 'yacc-line.test'.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 99e6b7b56..2e90032a6 100755
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -20,7 +20,7 @@
# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
# for yacc-generated .c and .h files.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index 2e1b4e3f6..3ebb57260 100755
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -20,7 +20,7 @@
# The tests 'yacc-nodist.test' and 'yacc-pr204.test' does similar checks
# for yacc-generated .c and .h files.
-required=lex
+required='cc lex'
. ./defs || Exit 1
cat >> configure.ac <<'EOF'
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 2838d6e80..ccc9a8f24 100755
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode for Lex.
-required=lex
+required='cc lex'
. ./defs || Exit 1
mkdir sub
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index 55ba24700..6a738cb8d 100755
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc, when yacc-generated headers are
# involved (i.e., the '-d' option is in *YFLAGS).
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
mkdir sub
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 35415bfb0..639b6789d 100755
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc.
# Keep this in sync with sister test 'silent-yacc-gcc.test'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
mkdir sub
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index 30f254340..f5d85459b 100755
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -17,7 +17,7 @@
# Test to make sure bison + bison's C++ skeleton + C++ works.
# For Automake bug#7648 and PR automake/491.
-required=bison
+required='c++ bison'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index b341401d3..8cf957bda 100755
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -17,7 +17,7 @@
# Test to make sure bison + bison's skeleton works.
# For Automake bug#7648 and PR automake/491.
-required=bison
+required='cc bison'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index ea21bffd7..d8ee1c65f 100755
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -20,7 +20,7 @@
# "make maintainer-clean".
# See also sister test 'yacc-clean.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 2af22eee7..dfcc12a40 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -18,7 +18,7 @@
# headers are not involved).
# Keep in sync with sister test 'yacc-basic.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index 09d7a7910..1f667c832 100755
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -18,7 +18,7 @@
# (i.e., '-d' in *YFLAGS).
# Keep in sync with sister test 'yacc-d-basic.test'.
-required=yacc
+required='c++ yacc'
. ./defs || Exit 1
write_parse ()
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index 5ab8d871a..3ac02541d 100755
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
@@ -16,7 +16,7 @@
# Tests that we can recover from deleted headers generated by 'yacc -d'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index 73d64ad12..04ddb522d 100755
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
@@ -17,7 +17,7 @@
# Make sure depcomp does not needlessly update headers for yacc rules.
# Report from Paolo Bonzini.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index 879cc5911..df48a0b87 100755
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -18,7 +18,7 @@
# for yacc rules. This test still fails with FreeBSD make (but passes
# with NetBSD make).
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 3fdae8d2a..6cb11eebe 100755
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -18,7 +18,7 @@
# using yacc and the automake 'subdir-objects' option.
# Exposes automake bug#8485.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
# This test is bounded to fail for any implementation that
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index ac6a0aa98..090b72b57 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -19,7 +19,7 @@
# 'subdir-object' option enabled.
# See also sister test 'lex-line.test'.
-required=yacc
+required='cc yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 8f72b35c4..d1229421e 100755
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -17,7 +17,7 @@
# Check that many different Yacc parsers (both C and C++) can co-exists
# in the same directory.
-required=yacc
+required='cc c++ yacc'
. ./defs || Exit 1
cat >> configure.ac << 'END'