[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-332-g38f41a0

[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=38f41a03549259cc1a70d5da10b082b1ba86d04b

The branch, maint has been updated
       via  38f41a03549259cc1a70d5da10b082b1ba86d04b (commit)
      from  7953494a128593bf74d2849f488f593c4d4fea9c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   13 +++++
 NEWS                                               |    3 +
 THANKS                                             |    1 +
 automake.in                                        |   10 +++-
 tests/Makefile.am                                  |    1 +
 tests/Makefile.in                                  |    1 +
 ...{parallel-tests-subdir.test => java-check.test} |   48 +++++++++++++-------
 7 files changed, 59 insertions(+), 18 deletions(-)
 copy tests/{parallel-tests-subdir.test => java-check.test} (52%)

diff --git a/ChangeLog b/ChangeLog
index 505d5d9..d82d363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-04-09  Stefano Lattarini  <address@hidden>
+
+       java: check_JAVA does not cause compilation by "make all" anymore
+       Fixes automake bug#8234.
+       * automake.in (handle_java): Make stamp of class files built from
+       java sources in $(check_JAVA) a dependency of `check' target, not
+       `all' target.
+       * tests/java-check.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       * THANKS: Update.
+       Report from Petteri Räty.
+
 2011-04-09  Ralf Wildenhues  <address@hidden>
 
        Clarify regex code in depcomp.
diff --git a/NEWS b/NEWS
index 6bd67f6..3cd5ab0 100644
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,9 @@ Bugs fixed in 1.11.0a:
     with Tru64/OSF 5.1 sh upon unreadable log files any more.
 
   - The makedepend depmode now works better with VPATH builds.
+
+  - Java sources specified with check_JAVA are not compiled anymore upon
+    "make all", but only upon "make check".
 
 New in 1.11:
 
diff --git a/THANKS b/THANKS
index 040da98..593ebc5 100644
--- a/THANKS
+++ b/THANKS
@@ -279,6 +279,7 @@ Peter O'Gorman              address@hidden
 Peter Rosin            address@hidden
 Peter Seiderer         address@hidden
 Petter Reinholdtsen    address@hidden
+Petteri Räty          address@hidden
 Phil Edwards           address@hidden
 Phil Nelson            address@hidden
 Philip Fong            address@hidden
diff --git a/automake.in b/automake.in
index d74730d..a8ec749 100755
--- a/automake.in
+++ b/automake.in
@@ -5121,8 +5121,14 @@ sub handle_java
        $dir = $curs;
       }
 
-
-    push (@all, 'class' . $dir . '.stamp');
+    if ($dir eq 'check')
+      {
+        push (@check, "class$dir.stamp");
+      }
+    else
+      {
+        push (@all, "class$dir.stamp");
+      }
 }
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c894864..bf07f2b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -421,6 +421,7 @@ interp2.test \
 java.test \
 java2.test \
 java3.test \
+java-check.test \
 javaprim.test \
 javasubst.test \
 ldadd.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6a4ae92..d8bf050 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -691,6 +691,7 @@ interp2.test \
 java.test \
 java2.test \
 java3.test \
+java-check.test \
 javaprim.test \
 javasubst.test \
 ldadd.test \
diff --git a/tests/parallel-tests-subdir.test b/tests/java-check.test
similarity index 52%
copy from tests/parallel-tests-subdir.test
copy to tests/java-check.test
index 18695fe..fd3fc96 100755
--- a/tests/parallel-tests-subdir.test
+++ b/tests/java-check.test
@@ -14,38 +14,54 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that the parallel-tests driver creates parent directories for
-# the log files when needed.
+# Make sure that check_JAVA causes *.class files to be built only with
+# "make check", and not also with "make all".
+# See automake bug#8234.
 
-parallel_tests=yes
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
+AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
+($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-TESTS = dir1/foo.test dir2/dir3/foo.test
-TEST_LOG_COMPILER = sh
+check_JAVA = One.java Two.java
 END
 
-mkdir dir1 dir2 dir2/dir3
-echo : > dir1/foo.test
-echo : > dir2/dir3/foo.test
+cat > One.java <<'END'
+class One { }
+END
+
+cat > Two.java <<'END'
+class Two { // Deliberately missing closing bracket.
+END
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a
+$AUTOMAKE
+
+inst=`pwd`/_inst
+
+./configure --prefix="$inst"
+
+$MAKE
+ls | $EGREP '\.(class|stamp)$' && Exit 1
+
+# Make Two.java compilable.
+echo '}' >> Two.java
 
-mkdir build
-cd build
-../configure
+# "make check" should compile files in $(check_JAVA) ...
 $MAKE check
-find . # For debugging.
-test -f test-suite.log
-test -f dir1/foo.log
-test -f dir2/dir3/foo.log
+ls -l # for debugging
+test -f One.class
+test -f Two.class
+# ... but should *not* install them.
+$FGREP checkdir Makefile && Exit 1
+$MAKE install
+test -d _inst && Exit 1
 
 :


hooks/post-receive
-- 
GNU Automake