On Monday 12 September 2011, Stefano Lattarini wrote:
> Hello automakers.
>
> The java-work branch contains mostly testsuite enahcements, but also a
> couple of bug fixes. There is no point in merging such bug fixes in
> master only though, since we plan to basically rewrite the whole
> Automake's Java support in the next release, with heavy paradigm and
> API changes (see <http://debbugs.gnu.org/9088>).
>
> My opinion is that we should cherry-pick the bug-fixing commits from
> java-work and merge them in master (so that they will be in 1.11.2),
>
I obviously meant "merge them in maint" here, sigh :-(
> and then merge java-work in master (mostly for the enhanced testsuite
> coverage, that I hope we could reuse, at least partly, for the new
> `JARS' primary).
>
> The commits that I plan to cherry-pick for maint are the following two:
> - d76b503883525aaab6048102cbfe96bbdd9a0a85
> "java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am"
> - 01dede4422493957c23b3bc7ecfe596f93a58a54
> "java: allow both JAVA and nobase_JAVA in the same Makefile.am"
>
> I will proceed with this plan in a couple of days if there is no
> objection.
>
> Then we'll have to tackle the more thorny problem of the deprecation
> of the older _JAVA primary ... but that's for when the new interface
> will be ready, so no need to rush.
>
I've proceeded with this plan. Merging with master, I've also found a
testuite bug, which I've fixed with the attached patch.
Regards,
Stefano
From 8d97cb95019b04707fdd60b4d9994d0acc9c6554 Mon Sep 17 00:00:00 2001
Message-Id: <8d97cb95019b04707fdd60b4d9994d0acc9c6554.1316359981.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sun, 18 Sep 2011 17:32:50 +0200
Subject: [PATCH] java: fix various blunders in test 'java-mix.test'
* tests/java-mix.test: Add missing call to `set -e'. Fix inverted
semantics (`.java' files are expected *not* to be distributed by
default, not the other way round). Fix various typos in the name
of the `.java' files. Correct other minor blunders. Improve some
comments.
---
ChangeLog | 9 +++++++++
tests/java-mix.test | 21 +++++++++++----------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f7a263..468c205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-18 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ java: fix various blunders in test 'java-mix.test'
+ * tests/java-mix.test: Add missing call to `set -e'. Fix inverted
+ semantics (`.java' files are expected *not* to be distributed by
+ default, not the other way round). Fix various typos in the name
+ of the `.java' files. Correct other minor blunders. Improve some
+ comments.
+
2011-04-23 Stefano Lattarini <stefano.lattar...@gmail.com>
java: allow both JAVA and nobase_JAVA in the same Makefile.am
diff --git a/tests/java-mix.test b/tests/java-mix.test
index 1c8163a..d6a43e7 100755
--- a/tests/java-mix.test
+++ b/tests/java-mix.test
@@ -16,10 +16,12 @@
# Check that the JAVA primary can be used freely in the same Makefile.am
# with proper combinations of the `dist_', `nodist_' and `nobase_'
-# modifiers .
+# modifiers. Also check that `.java' files are not ditributed by default.
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_OUTPUT
END
@@ -37,19 +39,18 @@ nobase_java_JAVA = ClassNobase.java
nobase_dist_java_JAVA = ClassNobaseDist.java
nobase_nodist_java_JAVA = ClassNobaseNodist.java
-Class3.java Class6.java:
+Class.java ClassNodist.java ClassNobase.java ClassNobaseNodist.java:
@echo '$@ should not be generated!' >&2; exit 1
END
-: > Class.java
: > ClassDist.java
-: > ClassNobase.java
: > ClassNobaseDist.java
$ACLOCAL
$AUTOCONF
-# Automake used to display non-fatal warnings with this test,
-# but those must be seen as a failure by us.
+# Automake used to display non-fatal warnings with this test, but
+# they were unexpected, so we want to consider them as failures in
+# this test.
$AUTOMAKE 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
test ! -s stderr
@@ -58,11 +59,11 @@ test ! -s stderr
$MAKE distdir
ls -l $distdir # For debugging.
-test -f $distdir/Class.java
+test ! -f $distdir/Class.java
test -f $distdir/ClassDist.java
-test -f $distdir/NobaseClass.java
-test -f $distdir/NobaseClassDist.java
+test ! -f $distdir/ClassNobase.java
+test -f $distdir/ClassNobaseDist.java
test ! -f $distdir/ClassNodist.java
-test ! -f $distdir/NobaseClassNodist.java
+test ! -f $distdir/ClassNobaseNodist.java
:
--
1.7.2.3
