Oops

Andrew Haley aph at redhat.com
Fri Jan 13 10:12:51 PST 2012


I think that I made a mistake when doing a merge, and deleted the
--samevm in check-jdk line by mistake:

diff -r e937f2726d70 -r 4d6b4215b78f Makefile.am
--- a/Makefile.am       Thu Dec 22 16:47:21 2011 +0000
+++ b/Makefile.am       Thu Dec 22 11:54:40 2011 -0500
@@ -193,7 +193,7 @@
 # Sources list

 REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
-JTREG_SRCS = $(abs_top_srcdir)/jtreg
+JTREG_SRCS = $(top_srcdir)/src/jtreg

 # Patch list

@@ -2172,7 +2172,7 @@
        $${XVFB_RUN} \
        $(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
                -w:test/jdk/JTwork -r:test/jdk/JTreport \
-               $${ICEDTEA_JTREG_OTHERVM:--samevm} \
+                \
                -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
                -exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \
                $(ICEDTEA_JTREG_OPTIONS) \

The change to JTREG_SRCS is correct, but the --samevm isn't.
I'll fix this when I commit the ARM fix.

Andrew.



More information about the distro-pkg-dev mailing list