Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 27 Oct 2012 09:57:43 +0000 (11:57 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 27 Oct 2012 09:57:43 +0000 (11:57 +0200)
* maint:
  depcomp: avoid potential interferences from the environment
  depcomp: improve comments about the 'gcc' depmode
  sync: update files from upstream with "make fetch"
  maintcheck: remove an obsolescent check
  tests: rename some tests to more expressive names, again
  tests: remove an obsolescent grepping check
  tests: merge two tests on automatic remake functionality
  tests: rename some test to more expressive names
  news: 'compile' supports libfoo.a naming when wrapping Microsoft tools
  tests: ensure generation of wrapper tests matching multiple conditions
  tests: simplify a loop in gen-testsuite-part
  compile: support libfoo.a naming when wrapping Microsoft tools
  NEWS: fix wording and grammaros, re-wrap text accordingly
  cosmetics: fix typo in 'lib/depcomp' comments

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
NEWS
t/list-of-tests.mk
t/remake-include-aclocal.sh
t/remake-makefile-intree.sh
t/remake-makefile-vpath.sh
t/remake-subdir3.sh

diff --cc NEWS
Simple merge
@@@ -743,13 -750,14 +743,13 @@@ t/parallel-am.sh 
  t/parallel-am2.sh \
  t/parallel-am3.sh \
  t/serial-tests.sh \
- t/parallel-tests.sh \
- t/parallel-tests3.sh \
- t/parallel-tests5.sh \
- t/parallel-tests6.sh \
- t/parallel-tests8.sh \
- t/parallel-tests9.sh \
- t/parallel-tests10.sh \
 -t/parallel-tests2.sh \
+ t/parallel-tests-basics.sh \
+ t/parallel-tests-concurrency.sh \
+ t/parallel-tests-concurrency-2.sh \
+ t/parallel-tests-empty.sh \
+ t/parallel-tests-generated-and-distributed.sh \
+ t/parallel-tests-recheck.sh \
+ t/parallel-tests-trailing-whitespace.sh \
  t/parallel-tests-recheck-depends-on-all.sh \
  t/parallel-tests-recheck-pr11791.sh \
  t/parallel-tests-exeext.sh \
@@@ -892,45 -900,33 +892,43 @@@ t/python-dist.sh 
  t/python-vars.sh \
  t/python-virtualenv.sh \
  t/python-pr10995.sh \
 -t/recurs.sh \
 -t/recurs2.sh \
 +t/recurs-user.sh \
 +t/recurs-user2.sh \
 +t/recurs-user-deeply-nested.sh \
 +t/recurs-user-indir.sh \
 +t/recurs-user-keep-going.sh \
 +t/recurs-user-many.sh \
 +t/recurs-user-no-subdirs.sh \
 +t/recurs-user-no-top-level.sh \
 +t/recurs-user-override.sh \
 +t/recurs-user-phony.sh \
 +t/recurs-user-wrap.sh \
  t/relativize.tap \
- t/remake.sh \
- t/remake1a.sh \
- t/remake2.sh \
- t/remake3.sh \
- t/remake3a.sh \
- t/remake4.sh \
- t/remake5.sh \
- t/remake6.sh \
- t/remake7.sh \
- t/remake8a.sh \
- t/remake8b.sh \
- t/remake9a.sh \
- t/remake9b.sh \
- t/remake9c.sh \
- t/remake9d.sh \
- t/remake10a.sh \
- t/remake10b.sh \
- t/remake10c.sh \
- t/remake11.sh \
- t/remake12.sh \
+ t/remake-fail.sh \
+ t/remake-not-after-make-dist.sh \
+ t/remake-maintainer-mode.sh \
+ t/remake-makefile-intree.sh \
+ t/remake-makefile-vpath.sh \
+ t/remake-after-configure-ac.sh \
+ t/remake-after-makefile-am.sh \
+ t/remake-after-acinclude-m4.sh \
+ t/remake-after-aclocal-m4.sh \
+ t/remake-include-configure.sh \
+ t/remake-include-makefile.sh \
+ t/remake-include-aclocal.sh \
+ t/remake-deeply-nested.sh \
+ t/remake-mild-stress.sh \
  t/remake-all-1.sh \
  t/remake-all-2.sh \
- t/remake-subdir-from-subdir.sh \
- t/remake-subdir-gnu.sh \
 +t/remake-recurs-user.sh \
  t/remake-subdir.sh \
  t/remake-subdir2.sh \
+ t/remake-subdir3.sh \
+ t/remake-subdir-only.sh \
+ t/remake-subdir-grepping.sh \
+ t/remake-subdir-from-subdir.sh \
+ t/remake-subdir-gnu.sh \
+ t/remake-subdir-no-makefile.sh \
  t/remake-subdir-long-time.sh \
  t/remake-gnulib-add-acsubst.sh \
  t/remake-gnulib-add-header.sh \
@@@ -946,9 -942,7 +944,9 @@@ t/remake-deleted-am-2.sh 
  t/remake-deleted-am-subdir.sh \
  t/remake-deleted-am.sh \
  t/remake-renamed-am.sh \
- t/pr8365-remake-timing.sh \
 +t/remake-aclocal-version-mismatch.sh \
 +t/remake-macrodir.sh \
+ t/remake-timing-bug-pr8365.sh \
  t/req.sh \
  t/reqd.sh \
  t/reqd2.sh \
Simple merge
Simple merge
Simple merge
Simple merge