From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 18 Sep 2011 16:32:12 +0000 (+0200)
Subject: Merge branch 'master' into test-protocols
X-Git-Tag: v1.11b~257^2~35^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=954f7d01cae6475f752b49daabe44f471962c961;p=platform%2Fupstream%2Fautomake.git

Merge branch 'master' into test-protocols
---

954f7d01cae6475f752b49daabe44f471962c961
diff --cc ChangeLog
index ecde3d6,521ca9f..8024777
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,34 +1,43 @@@
+ 2011-09-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	automake: remove special handling of `ANSI2KNR' make variable
+ 	* automake.in (define_configure_variable): Remove special-cased
+ 	handling of `ANSI2KNR' variable.  Related minor simplifications.
+ 
+ 2011-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	cosmetics: fix various typos and grammaros
+ 	* NEWS: Fix typos.
+ 	* tests/py-compile-basic.test: Likewise.
+ 	* tests/py-compile-basedir.test: Fix botched wording in comments.
+ 	* tests/py-compile-option-terminate.test: Fix typo and incomplete
+ 	comment.
+ 	Suggestions by Peter Rosin.
+ 
+ 2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	coverage: test interactions of `nobase_' and `nodist_'
+ 	* tests/nobase-nodist.test: New test.
+ 	* tests/Makefile.am (TESTS): Add it.
+ 
+ 2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	java: fix various blunders in test 'java-mix.test'
+ 	* tests/java-mix.test: Add missing call to `set -e'.  Fix inverted
+ 	semantics (`.java' files are expected *not* to be distributed by
+ 	default, not the other way round).  Fix various typos in the name
+ 	of the `.java' files.  Correct other minor blunders.  Improve some
+ 	comments.
+ 
 +2011-09-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	automake: remove code duplication in 'handle_tests'
 +	* automake.in (handle_tests): Factor out some code dealing with
 +	test extensions and rules for generation of `.log' files into ...
 +	(handle_per_suffix_test): ... this new subroutine.
 +	* tests/parallel-tests-exeext.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +
  2011-09-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	tests: fix spurious failure on fast machines
diff --cc tests/Makefile.in
index bca33ef,566f39d..f118c87
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -278,27 -293,21 +278,27 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +TEST_EXTENSIONS = .test .tap
 +TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 +AM_TAP_LOG_DRIVER_FLAGS = --merge
  MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
  EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
 -	$(TESTS) distcheck-hook-m4.am
 +	$(TESTS) tap-functions.sh plain-functions.sh \
 +	trivial-test-driver testsuite-summary-checks.sh \
 +	extract-testsuite-summary tap-setup.sh tap-summary-aux.sh \
 +	distcheck-hook-m4.am
  XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
- 	override-conditional-2.test pr8365-remake-timing.test \
- 	yacc-dist-nobuild-subdir.test vala-vpath.test txinfo5.test \
- 	$(instspc_xfail_tests)
+ 	override-conditional-2.test java-nobase.test \
+ 	pr8365-remake-timing.test yacc-dist-nobuild-subdir.test \
+ 	vala-vpath.test txinfo5.test $(instspc_xfail_tests)
 -parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \
 -	check-exported-srcdir-p.test check-tests-in-builddir-p.test \
 -	check-tests_environment-p.test check-p.test check10-p.test \
 -	check11-p.test check12-p.test check2-p.test check3-p.test \
 -	check4-p.test check5-p.test check6-p.test check7-p.test \
 -	check8-p.test check9-p.test color-p.test color2-p.test \
 -	comment9-p.test dejagnu-p.test exeext4-p.test maken3-p.test \
 -	maken4-p.test posixsubst-tests-p.test
 +parallel_tests = check-concurrency-bug9245-p.test \
 +	check-exported-srcdir-p.test check-fd-redirect-p.test \
 +	check-tests-in-builddir-p.test check-p.test check11-p.test \
 +	check12-p.test check2-p.test check3-p.test check4-p.test \
 +	check5-p.test check6-p.test check7-p.test check8-p.test \
 +	check9-p.test color-p.test color2-p.test comment9-p.test \
 +	dejagnu-p.test exeext4-p.test maken3-p.test maken4-p.test \
 +	posixsubst-tests-p.test tests-environment-p.test
  instspc_tests = instspc-squote-build.test instspc-squote-install.test \
  	instspc-dquote-build.test instspc-dquote-install.test \
  	instspc-bquote-build.test instspc-bquote-install.test \