From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 4 May 2011 21:09:54 +0000 (+0200)
Subject: Merge branch 'master' into testsuite-work
X-Git-Tag: ng-0.5a~89^2~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712c0dd4676bff9a47d11825ec59061fcd1e3cfb;p=thirdparty%2Fautomake.git

Merge branch 'master' into testsuite-work
---

712c0dd4676bff9a47d11825ec59061fcd1e3cfb
diff --cc ChangeLog
index 6ab07c7e7,a6a074503..4b10c8e66
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,37 -1,18 +1,52 @@@
+ 2011-05-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	tests defs: allow requirements for compilers (mostly dummy)
+ 	Most of the new requirements that are now accepted in `$required'
+ 	as consequence of this patch are still dummy.  They are planned
+ 	to be implemented only in master (or in some derived branch), but
+ 	having them here (even just as no-op) will allow for an easier
+ 	integration/backporting of potential new testcases.
+ 	* tests/defs.in (cc, c++, fortran, fortran77): New requirements,
+ 	still dummy.
+ 	(flex): New requirement, picking LEX for configure.
+ 	(lex): New requirement, alias for `flex'.  A more appropriate
+ 	implementation, looking for a generic `lex' program, will follow
+ 	in the future.
+ 
 +2011-05-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: 'silent-many-gcc.test' improved and made more robust
 +	* tests/silent-many-gcc.test:  Also force "fast" gcc depmode
 +	for C++ compilations.  Add sanity checks verifying that the
 +	cache variables we force are really used by configure.  Fix
 +	typo in comments.
 +
 +2011-05-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: drop useless requirements of 'g++'
 +	* tests/lflags2.test ($required): Remove 'g++', as any working
 +	C++ compiler should be enough, and ./configure will cause the
 +	test to skip if no working C++ compiler is found.
 +	* tests/yflags2.test: Likewise.
 +	* tests/subobj9.test: Likewise.
 +	* tests/silentcxx.test: Likewise.  Also, do not force depmodes
 +	that could cause non-GNU C++ compilers to fail.
 +	* tests/silentcxx-gcc.test: New test, like `silentcxx.test',
 +	but forcing "fast" gcc depmode (and thus requiring the GNU C++
 +	compiler).
 +	* tests/specflg10.test: Add proper "fixme" comment telling that
 +	we should make this test work with a generic C++ compiler.
 +	* tests/Makefile.am (TESTS): Update.
 +
 +2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests defs: one more environment sanitization (corner case)
 +	* tests/defs (am__using_gmake): Initialize.  The `using_gmake'
 +	subroutine was using this variable for caching, but wasn't
 +	initializing it, which could cause problems in the (admittedly
 +	very unlikely) case in which it was pre-existent in the
 +	environment.
 +
  2011-05-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: add forgotten test scripts to $(TESTS)
diff --cc tests/defs
index 44c5b3b5a,6ee183017..d2f128466
--- a/tests/defs
+++ b/tests/defs
@@@ -413,9 -405,15 +416,16 @@@ d
  	test "${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \
  		= c,a/b,b/c, \
  	&& eval 'test $(( 1 + 1 )) -eq 2 \
 -	&& test "${#_am_dummy}" -eq 5' ) || exit 77
 +	&& test "${#_am_dummy}" -eq 5' ) \
 +          || skip_ "the shell lacks some required XSI features"
        ;;
+     flex|lex)
+       # Since flex is required, we pick LEX for ./configure.
+       LEX=flex
+       export LEX
+       echo "$me: running flex --version"
+       flex --version || exit 77
+       ;;
      yacc)
        if test x"$YACC" = x"no"; then
          # The user has explicitly told he doesn't want a yacc program