From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 18 Sep 2011 15:32:50 +0000 (+0200)
Subject: java: fix various blunders in test 'java-mix.test'
X-Git-Tag: ng-0.5a~122^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d97cb95019b04707fdd60b4d9994d0acc9c6554;p=thirdparty%2Fautomake.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 1f7a26324..468c205b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-18  Stefano Lattarini  <stefano.lattarini@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.lattarini@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 1c8163ac1..d6a43e79e 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
 
 :