Merge branch 'master' into test-protocols

[platform/upstream/automake.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f58b01a..b298f85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       parallel-tests: warn on conditional TEST_EXTENSIONS definition
+       Before this change, automake would have still bailed out, but
+       with a confusing error message (about an invalid redefinition
+       of TEST_EXTENSIONS).
+       * automake.in (handle_tests): Warn explicitly if TEST_EXTENSIONS
+       has conditional contents.
+       * tests/test-extensions-con.test: New test.
+       * tests/Makefile.am (TESTS): Add it.
+       * NEWS: Update.
+
 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        parallel-tests: don't allow @substitutions@ in TEST_EXTENSIONS