From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 3 Aug 2011 14:01:14 +0000 (+0200)
Subject: Merge branch 'test-protocols' into tap-testsuite-work
X-Git-Tag: ng-0.5a~89^2~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebb334e7ec6319b36f963143c387c6883e832806;p=thirdparty%2Fautomake.git

Merge branch 'test-protocols' into tap-testsuite-work

* test-protocols:
  testsuite: list "forgotten" test script in Makefile.am
  testsuite: remove duplicated mention of a test in Makefile.am
---

ebb334e7ec6319b36f963143c387c6883e832806
diff --cc tests/Makefile.am
index 2ba3abcff,be2d16ad4..48b354dda
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -777,10 -733,9 +777,11 @@@ parallel-tests-harderror.test 
  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-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 \
diff --cc tests/Makefile.in
index afe3b4c00,0a9194718..82fab27c5
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1053,10 -987,9 +1053,11 @@@ parallel-tests-harderror.test 
  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-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 \