[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-941-g93a1c8a

[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=93a1c8a908af2ac955405d622abf6d8711ffb522

The branch, master has been updated
       via  93a1c8a908af2ac955405d622abf6d8711ffb522 (commit)
       via  236ad0bcb351a6e0795a69f272646bd2201b4056 (commit)
      from  a7122ebe28e35ff3d1226ecb2a70520f1bec14bc (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 93a1c8a908af2ac955405d622abf6d8711ffb522
Merge: a7122eb 236ad0b
Author: Stefano Lattarini <address@hidden>
Date:   Thu Aug 25 21:22:19 2011 +0200

    Merge branch 'maint'
    
    * 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 25c5394..a4b2b3b 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 8502409..a194f44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -544,6 +544,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 java-extra.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5b57141..7fe2c93 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -817,6 +817,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 java-extra.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