* [PATCH] Fix libjava/testsuite compile-tests in --enable-java-maintainer-mode
@ 2007-12-09 10:02 Jakub Jelinek
2007-12-17 16:20 ` Andrew Haley
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2007-12-09 10:02 UTC (permalink / raw)
To: Andrew Haley, Tom Tromey; +Cc: gcc-patches
Hi!
The SVN contains libjava/testsuite/libjava.jvmti/interp/*.h built as JNI
headers (and if they aren't JNI, several tests fail), but
--enable-java-maintainer-mode builds them as -cni headers.
Fixed thusly, ok for trunk?
2007-12-09 Jakub Jelinek <jakub@redhat.com>
* testsuite/Makefile.am (compile-tests): Build
libjava.jvmti/interp/*.h with -jni rather than -cni.
* testsuite/Makefile.in: Rebuilt.
--- libjava/testsuite/Makefile.am 2007-02-07 13:07:16.000000000 +0100
+++ libjava/testsuite/Makefile.am 2007-12-08 10:58:02.000000000 +0100
@@ -43,7 +43,7 @@ if JAVA_MAINTAINER_MODE
testdep="libjava.loader/MyLoader.java";; \
libjava.jni/register2.java) \
;; \
- libjava.jni/*.java) \
+ libjava.jni/*.java|libjava.jvmti/interp/*.java) \
genheader=-jni;; \
libjava.jvmti/*.java|libjava.cni/*.java) \
genheader=-cni;; \
--- libjava/testsuite/Makefile.in 2007-09-04 23:09:37.000000000 +0200
+++ libjava/testsuite/Makefile.in 2007-12-08 10:58:25.000000000 +0100
@@ -558,7 +558,7 @@ compile-tests:
@JAVA_MAINTAINER_MODE_TRUE@ testdep="libjava.loader/MyLoader.java";; \
@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/register2.java) \
@JAVA_MAINTAINER_MODE_TRUE@ ;; \
-@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/*.java) \
+@JAVA_MAINTAINER_MODE_TRUE@ libjava.jni/*.java|libjava.jvmti/interp/*.java) \
@JAVA_MAINTAINER_MODE_TRUE@ genheader=-jni;; \
@JAVA_MAINTAINER_MODE_TRUE@ libjava.jvmti/*.java|libjava.cni/*.java) \
@JAVA_MAINTAINER_MODE_TRUE@ genheader=-cni;; \
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix libjava/testsuite compile-tests in --enable-java-maintainer-mode
2007-12-09 10:02 [PATCH] Fix libjava/testsuite compile-tests in --enable-java-maintainer-mode Jakub Jelinek
@ 2007-12-17 16:20 ` Andrew Haley
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Haley @ 2007-12-17 16:20 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Tom Tromey, gcc-patches
Jakub Jelinek writes:
> Hi!
>
> The SVN contains libjava/testsuite/libjava.jvmti/interp/*.h built as JNI
> headers (and if they aren't JNI, several tests fail), but
> --enable-java-maintainer-mode builds them as -cni headers.
>
> Fixed thusly, ok for trunk?
>
> 2007-12-09 Jakub Jelinek <jakub@redhat.com>
>
> * testsuite/Makefile.am (compile-tests): Build
> libjava.jvmti/interp/*.h with -jni rather than -cni.
> * testsuite/Makefile.in: Rebuilt.
Yes, thanks.
Andrew.
--
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-17 15:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-12-09 10:02 [PATCH] Fix libjava/testsuite compile-tests in --enable-java-maintainer-mode Jakub Jelinek
2007-12-17 16:20 ` Andrew Haley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).