From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 7 Oct 2011 11:11:57 +0000 (+0200)
Subject: Merge branch 'master' into test-protocols
X-Git-Tag: v1.11b~257^2~28^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3d1cdbc30755257b4a0f001c4cc8e6acaba72d1;p=platform%2Fupstream%2Fautomake.git

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

a3d1cdbc30755257b4a0f001c4cc8e6acaba72d1
diff --cc tests/Makefile.am
index 2d63a3d,6b14a30..35baf9e
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -760,45 -756,8 +760,46 @@@ parallel-tests-log-override-recheck.tes
  parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.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 \
 +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-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-harness-vpath-rewrite.test \
 +test-log.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 \
diff --cc tests/Makefile.in
index 5b3a3df,2bc73d7..3d7fe7c
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1023,45 -1032,8 +1023,46 @@@ parallel-tests-log-override-recheck.tes
  parallel-tests-cmdline-override.test \
  parallel-tests-log-compiler-example.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 \
 +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-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-harness-vpath-rewrite.test \
 +test-log.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 \