diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-18 16:32:46 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-18 16:32:46 +0200 |
| commit | 16912bdf1eeeeac517377e15c6c8bfe7743f9419 (patch) | |
| tree | 3929008e7a6ed64ac63e1ceee7fb46cb7d796ad1 /tests/java.test | |
| parent | 074b1188ea90da631ead2201ef66c7375d5a1e5c (diff) | |
| parent | 54942406955b4368104208eadeb55a13a258fa2e (diff) | |
| download | automake-16912bdf1eeeeac517377e15c6c8bfe7743f9419.tar.gz | |
Merge branch 'java-work'
* java-work:
fix: remove duplicated ChangeLog entries
java: allow both JAVA and nobase_JAVA in the same Makefile.am
java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
fix: regenerate tests/Makefile.in
tests defs: use `skip_' for skipping java-related tests
java tests: use $PATH_SEPARATOR where appropriate
java coverage: test JAVACFLAGS and AM_JAVACFLAGS
java coverage: test rebuild rules for java
java coverage: try to build and run a java program
test defs: new requirement for the default java interpreter
java tests: tweak and make stricter a couple of tests
java coverage: add test on uninstall with JAVA primary
java tests: require java compiler more properly
java: allow both JAVA and nobase_JAVA in the same Makefile.am
java: allow both dist_JAVA and nodist_JAVA in the same Makefile.am
Diffstat (limited to 'tests/java.test')
| -rwxr-xr-x | tests/java.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/java.test b/tests/java.test index 671d2fda2..fdf209297 100755 --- a/tests/java.test +++ b/tests/java.test @@ -24,7 +24,6 @@ cat >>configure.in <<'EOF' AC_OUTPUT EOF - cat > Makefile.am << 'END' javadir = $(datadir)/java dist_java_JAVA = a.java b.java @@ -33,7 +32,10 @@ END $ACLOCAL $AUTOCONF $AUTOMAKE -grep '^all[-a-z]*:.*classdist_java\.stamp' Makefile.in + +$EGREP '\.stamp|class' Makefile.in # For debugging. +grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in +test `grep -c '^all[-a-z]*:.*classjava\.stamp' Makefile.in` -eq 1 cat >a.java <<EOF class a |