From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 15 Jan 2012 21:42:34 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239a5894acb53e6b72f281699ff20edb60dac7a3;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: move list of tests in its own Makefile fragment
  build: silence automake build system
---

239a5894acb53e6b72f281699ff20edb60dac7a3
diff --cc configure.ac
index e8a19db34,bc04e56d8..23ebc6b54
--- a/configure.ac
+++ b/configure.ac
@@@ -23,7 -23,8 +23,9 @@@ AC_INIT([GNU Automake], [1.11a], [bug-a
  AC_CONFIG_SRCDIR([automake.in])
  AC_CONFIG_AUX_DIR([lib])
  
+ AM_SILENT_RULES([yes])
+ 
 +AC_CANONICAL_HOST
  AC_CANONICAL_BUILD
  
  # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
diff --cc tests/list-of-tests.mk
index f1c66154f,efefbc567..cf1fae2e0
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -2,7 -2,7 +2,8 @@@
  ## testsuite.  This fragment is meant to be included by the Makefile.am,
  ## but also to be executed directly by make when bootstrapping automake.
  
 +## Copyright (C) 2011 Free Software Foundation, Inc.
+ ## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
  ##
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
@@@ -696,52 -620,8 +697,52 @@@ parallel-tests-log-override-1.test 
  parallel-tests-log-override-2.test \
  parallel-tests-log-override-recheck.test \
  parallel-tests-log-compiler-example.test \
 +parallel-tests-cmdline-override.test \
 +parallel-tests-fork-bomb.test \
 +parallel-tests-empty-testlogs.test \
 +parallel-tests-driver-install.test \
 +parallel-tests-no-color-in-log.test \
 +parallel-tests-no-spurious-summary.test \
 +parallel-tests-exit-statuses.test \
 +parallel-tests-console-output.test \
 +parallel-tests-once.test \
 +parallel-tests-trailing-bslash.test \
 +tests-environment.test \
 +am-tests-environment.test \
 +tests-environment-backcompat.test \
 +testsuite-summary-color.test \
 +testsuite-summary-count.test \
 +testsuite-summary-count-many.test \
 +testsuite-summary-reference-log.test \
 +test-driver-acsubst.test \
 +test-driver-cond.test \
 +test-driver-custom-no-extra-driver.test \
 +test-driver-custom.test \
 +test-driver-custom-xfail-tests.test \
 +test-driver-custom-multitest.test \
 +test-driver-custom-multitest-recheck.test \
 +test-driver-custom-multitest-recheck2.test \
 +test-driver-custom-html.test \
 +test-driver-custom-no-html.test \
 +test-driver-create-log-dir.test \
 +test-driver-strip-vpath.test \
 +test-driver-trs-suffix-registered.test \
 +test-driver-fail.test \
 +test-driver-is-distributed.test \
- test-extensions.test \
- test-extensions-cond.test \
 +test-harness-vpath-rewrite.test \
 +test-log.test \
 +test-logs-repeated.test \
 +test-metadata-global-log.test \
 +test-metadata-global-result.test \
 +test-metadata-recheck.test \
 +test-metadata-results.test \
 +test-missing.test \
 +test-missing2.test \
 +test-trs-basic.test \
 +test-trs-recover.test \
 +test-trs-recover2.test \
+ test-extensions.test \
+ test-extensions-cond.test \
  parse.test \
  percent.test \
  percent2.test \
@@@ -798,10 -669,9 +799,10 @@@ primary-prefix-valid-couples.test 
  primary-prefix-couples-force-valid.test \
  primary-prefix-couples-documented-valid.test \
  proginst.test \
 +programs-primary-rewritten.test \
- py-compile-basedir.test \
  py-compile-basic.test \
  py-compile-basic2.test \
+ py-compile-basedir.test \
  py-compile-destdir.test \
  py-compile-env.test \
  py-compile-option-terminate.test \
@@@ -851,21 -702,15 +852,21 @@@ remake-subdir-gnu.test 
  remake-subdir.test \
  remake-subdir2.test \
  remake-subdir-long-time.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
- remake-renamed-am.test \
+ remake-am-pr10111.test \
+ remake-m4-pr10111.test \
 -remake-deleted-am.test \
  remake-deleted-am-2.test \
  remake-deleted-am-subdir.test \
 +remake-deleted-am.test \
- remake-am-pr10111.test \
- remake-m4-pr10111.test \
+ remake-renamed-am.test \
  pr8365-remake-timing.test \
 -regex.test \
 -regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \