[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-474-gc02cc9e

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c02cc9e306fdb64e71646ab31a7dcac001ff9a6b

The branch, branch-1.11 has been updated
       via  c02cc9e306fdb64e71646ab31a7dcac001ff9a6b (commit)
       via  236ad0bcb351a6e0795a69f272646bd2201b4056 (commit)
      from  1b84056409dd3036609019edd834a19c170502c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c02cc9e306fdb64e71646ab31a7dcac001ff9a6b
Merge: 1b84056 236ad0b
Author: Stefano Lattarini <address@hidden>
Date:   Thu Aug 25 21:22:40 2011 +0200

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: list "forgotten" test script in TESTS

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |    7 +++++++
 tests/Makefile.am               |    1 +
 tests/Makefile.in               |    1 +
 tests/java-empty-classpath.test |    4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c5016d..382f0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tests: list "forgotten" test script in TESTS
+       * tests/Makefile.am (TESTS): Also list ...
+       * tests/java-empty-classpath.test: ... this test.  Since we are
+       at it, remove trailing whitespace from a couple of lines.
+
 2011-08-25  Eric Blake  <address@hidden>
 
        ylwrap: fix unusual indentation whitespace
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2a55fd..a1c67ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -444,6 +444,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 ldadd.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c909685..8a3c563 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -722,6 +722,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 ldadd.test \
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
index 230bb7c..e94f885 100755
--- a/tests/java-empty-classpath.test
+++ b/tests/java-empty-classpath.test
@@ -37,8 +37,8 @@ cat > Makefile.am <<END
 CLEANFILES = *.class
 SUBDIRS = org
 END
-echo SUBDIRS = gnu > org/Makefile.am 
-echo SUBDIRS = bug > org/gnu/Makefile.am 
+echo SUBDIRS = gnu > org/Makefile.am
+echo SUBDIRS = bug > org/gnu/Makefile.am
 cat > org/gnu/bug/Makefile.am <<'END'
 JAVAROOT = ../../..
 dist_noinst_JAVA = Library.java Application.java


hooks/post-receive
-- 
GNU Automake