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.lattar...@gmail.com> --- t/lex-clean.sh | 2 +- t/lex-depend.sh | 2 +- t/lex-line.sh | 2 +- t/lex-nodist.sh | 2 +- t/lex-pr204.sh | 2 +- t/silent-lex.sh | 2 +- t/silent-yacc-headers.sh | 2 +- t/silent-yacc.sh | 2 +- t/yacc-bison-skeleton-cxx.sh | 2 +- t/yacc-bison-skeleton.sh | 2 +- t/yacc-clean-cxx.sh | 2 +- t/yacc-cxx.sh | 2 +- t/yacc-d-cxx.sh | 2 +- t/yacc-deleted-headers.sh | 2 +- t/yacc-depend.sh | 2 +- t/yacc-depend2.sh | 2 +- t/yacc-dist-nobuild-subdir.sh | 2 +- t/yacc-line.sh | 2 +- t/yacc-mix-c-cxx.sh | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/t/lex-clean.sh b/t/lex-clean.sh index 4213195..18cf32e 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 9487f4a..fce198d 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 05b6f99..f690e7e 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 99e6b7b..2e90032 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 2e1b4e3..3ebb572 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 2838d6e..ccc9a8f 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 55ba247..6a738cb 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 35415bf..639b678 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 30f2543..f5d8545 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 b341401..8cf957b 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 ea21bff..d8ee1c6 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 2af22ee..dfcc12a 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 09d7a79..1f667c8 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 5ab8d87..3ac0254 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 73d64ad..04ddb52 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 879cc59..df48a0b 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 3fdae8d..6cb11ee 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 ac6a0aa..090b72b 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 8f72b35..d122942 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' -- 1.7.9.5
