/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 29 17:39:10 PST 2010
changeset be247265a24d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be247265a24d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 29 01:24:21 2010 +0000
Add general stamps/plugin.stamp and clean-plugin targets for the
plugin.
2010-01-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Use one general stamps/plugin.stamp
to mark plugin installation as in IcedTea7. Add
matching clean-plugin target.
changeset a4c9d01462e1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4c9d01462e1
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 29 17:29:54 2010 +0000
Merge
changeset f24b4ea9a462 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f24b4ea9a462
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 29 20:00:45 2010 +0000
Add missing ICEDTEANPPLUGIN_TARGET dependency on icedtea and
icedtea-debug.
2010-01-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add ICEDTEANPPLUGIN_TARGET back as a
dependency of icedtea and icedtea-debug.
changeset ec2ae0d51146 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ec2ae0d51146
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 30 01:38:48 2010 +0000
Add conditional INITIAL_BOOTSTRAP_LINK_STAMP to avoid duplicate
javac/jar calls.
2010-01-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP to
avoid the need to check for bootstrap/jdk1.6.0 on each javac
or jar invocation.
diffstat:
8 files changed, 478 insertions(+), 201 deletions(-)
ChangeLog | 40 +
Makefile.am | 180 ++-----
patches/icedtea-6920143-using-with-mouse.patch | 45 +
patches/icedtea-6920172-location-relative-to-test.patch | 27 +
patches/icedtea-6920172-turkish.patch | 14
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 1
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 23
ports/hotspot/src/cpu/zero/vm/thumb2.cpp | 349 +++++++++++----
diffs (truncated from 1268 to 500 lines):
diff -r bb0e039df90a -r ec2ae0d51146 ChangeLog
--- a/ChangeLog Wed Jan 27 17:52:01 2010 +0000
+++ b/ChangeLog Sat Jan 30 01:38:48 2010 +0000
@@ -1,3 +1,43 @@ 2010-01-27 Andrew John Hughes <ahughes@
+2010-01-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP
+ to avoid the need to check for bootstrap/jdk1.6.0
+ on each javac or jar invocation.
+
+2010-01-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add ICEDTEANPPLUGIN_TARGET
+ back as a dependency of icedtea and icedtea-debug.
+
+2010-01-28 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patches.
+ * patches/icedtea-6920143-using-with-mouse.patch:
+ Fix for Sun bug 6920143: added small delay to make
+ sure that TextArea animation have finished
+ * patches/icedtea-6920172-location-relative-to-test.patch:
+ Fix for Sun bug 6920172: test case correction. Check
+ frame position against graphics environment's
+ center point
+ * patches/icedtea-6920172-turkish.patch:
+ Added othervm flag to ensure that this test will run
+ in isolation
+
+2010-01-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Use one general
+ stamps/plugin.stamp to mark plugin
+ installation as in IcedTea7. Add
+ matching clean-plugin target.
+
+2010-01-28 Edward Nevill <ed at camswl.com>
+
+ * asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp
+ Add stack checking in JIT code, fix IllegalMonitorException bug,
+ make compilation MP safe, fix bug with large no. of locals,
+ added buffer checking on compile buffer, fix large tableswitch bug,
+ fix byte accessor bug, add opc_return_register_finalizer.
+
2010-01-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Reference plugin
diff -r bb0e039df90a -r ec2ae0d51146 Makefile.am
--- a/Makefile.am Wed Jan 27 17:52:01 2010 +0000
+++ b/Makefile.am Sat Jan 30 01:38:48 2010 +0000
@@ -112,8 +112,8 @@ endif
# FIXME (plugin): LIVECONNECT_DIR becomes sun/applet netscape
# FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
if ENABLE_NPPLUGIN
-ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin.stamp
+ICEDTEANPPLUGIN_CLEAN = clean-IcedTeaNPPlugin
+ICEDTEANPPLUGIN_TARGET = $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = -C lib/rt netscape
NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
@@ -122,7 +122,7 @@ else
else
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-ICEDTEAPLUGIN_TARGET = stamps/icedtea-plugin.stamp
+ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
LIVECONNECT_DIR = -C lib/rt netscape
NPPLUGIN_DIR =
@@ -184,11 +184,13 @@ endif
# FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
if WITH_OPENJDK
- BOOTSTRAP_DIRECTORY_STAMP =
+ BOOTSTRAP_DIRECTORY_STAMP =
ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
else
BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
endif
# Sources list
@@ -307,7 +309,10 @@ ICEDTEA_PATCHES = \
patches/icedtea-linux-separate-debuginfo.patch \
patches/icedtea-parisc.patch \
patches/icedtea-sh4-support.patch \
- patches/libpng.patch
+ patches/libpng.patch \
+ patches/icedtea-6920143-using-with-mouse.patch \
+ patches/icedtea-6920172-location-relative-to-test.patch \
+ patches/icedtea-6920172-turkish.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1217,7 +1222,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(ICEDTEAPLUGIN_TARGET) \
+ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1316,7 +1321,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- $(ICEDTEAPLUGIN_TARGET) \
+ $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
stamps/pulse-java.stamp
$(ARCH_PREFIX) $(MAKE) \
@@ -1518,10 +1523,6 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
$(MOZILLA_LIBS)\
-shared -o $@
-stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
- mkdir -p stamps
- touch stamps/icedtea-npplugin.stamp
-
clean-IcedTeaNPPlugin:
cd $(NPPLUGIN_DIR);\
rm -f *.o; \
@@ -1547,18 +1548,19 @@ IcedTeaPlugin.so: IcedTeaPlugin.o
$(MOZILLA_LIBS) \
-shared -o $@
-stamps/icedtea-plugin.stamp: IcedTeaPlugin.so
- mkdir -p stamps
- touch stamps/icedtea-plugin.stamp
-
clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.o
rm -f IcedTeaPlugin.so
endif
endif
-#FIXME (plugin): Missing plugin.stamp
-#FIXME (clean): Missing clean-plugin
+stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET)
+ mkdir -p stamps
+ touch stamps/icedtea-plugin.stamp
+
+clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
+ rm -f stamps/plugin.stamp
+
#FIXME (plugin): Missing liveconnect-source-files.txt
#FIXME (plugin): Missing liveconnect.stamp
#FIXME (plugin): Missing liveconnect-dist.stamp
@@ -1572,21 +1574,14 @@ extra-source-files.txt:
extra-source-files.txt:
find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
-stamps/extra-class-files.stamp: extra-source-files.txt \
+stamps/extra-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
+ extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p extra-lib
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
- -source 1.5 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -bootclasspath \'\' @extra-source-files.txt ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -source 1.5 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -bootclasspath \'\' @extra-source-files.txt ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
+ -source 1.5 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath \'\' @extra-source-files.txt ;
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
@@ -1636,26 +1631,15 @@ endif
mkdir -p stamps
touch stamps/pulse-java-jar.stamp
-stamps/pulse-java-class.stamp:
+stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
if ENABLE_PULSE_JAVA
mkdir -p $(PULSE_JAVA_CLASS_DIR)
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(JAVAC) -g -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- org/classpath/icedtea/pulseaudio/*.java\
- ) \
- else \
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
- -bootclasspath \
- '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
- org/classpath/icedtea/pulseaudio/*.java\
- ) \
- fi
- cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
+ (cd $(PULSE_JAVA_JAVA_SRCDIR); \
+ $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
+ -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
+ org/classpath/icedtea/pulseaudio/*.java\
+ )
+ cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
endif
mkdir -p stamps
@@ -1696,8 +1680,7 @@ endif
# VisualVM
-stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/replace-hotspot.stamp \
- stamps/download.stamp
+stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract.stamp
if WITH_VISUALVM
cd netbeans ; \
rm nbbuild/external/binaries-list ; \
@@ -1902,25 +1885,17 @@ endif
# plugin tests
-stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) \
+stamps/plugin-tests.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) $(PLUGIN_TEST_SRCS) \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p plugin/tests/LiveConnect
if test -d lib/rt/netscape ; then \
set -e ; \
- if ! test -d $(ICEDTEA_BOOT_DIR) ; then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d plugin/tests/LiveConnect \
- -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ; \
- $(JAR) cf plugin/tests/LiveConnect/PluginTest.jar \
- plugin/tests/LiveConnect/*.class ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d plugin/tests/LiveConnect \
- -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- -source 1.5 $(PLUGIN_TEST_SRCS) ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
- plugin/tests/LiveConnect/*.class ; \
- fi ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+ -d plugin/tests/LiveConnect \
+ -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -source 1.5 $(PLUGIN_TEST_SRCS) ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+ plugin/tests/LiveConnect/*.class ; \
cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; \
echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
fi
@@ -2065,22 +2040,14 @@ hotspot-tools-source-files.txt: stamps/r
mkdir -p lib/hotspot-tools
# FIXME (plugs): Remove this
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -source 1.5 \
- -sourcepath \
- 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
- -classpath \'\' -bootclasspath \'\' @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d lib/hotspot-tools \
- -source 1.5 \
- -sourcepath \
- 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
- -classpath \'\' -bootclasspath \'\' @$< ; \
- fi
+stamps/hotspot-tools-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
+ hotspot-tools-source-files.txt
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+ -d lib/hotspot-tools \
+ -source 1.5 \
+ -sourcepath \
+ 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+ -classpath \'\' -bootclasspath \'\' @hotspot-tools-source-files.txt ;
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -2120,22 +2087,13 @@ rt-source-files.txt: stamps/replace-hots
find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
| sort -u > $@
-stamps/rt-class-files.stamp: rt-source-files.txt
+stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
mkdir -p lib/rt
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
- -source 1.5 \
- -sourcepath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- -classpath \'\' -bootclasspath \'\' @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -source 1.5 \
- -sourcepath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- -classpath \'\' -bootclasspath \'\' @$< ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.5 \
+ -sourcepath \
+ '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
+ -classpath \'\' -bootclasspath \'\' @rt-source-files.txt ;
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -2147,19 +2105,13 @@ clean-rt:
rm -f rt-source-files.txt
# tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
+bootstrap/jdk1.7.0/jre/lib/tools.jar: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
+ stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
- -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
+ -C lib/hotspot-tools sun \
+ -C lib/hotspot-tools org -C lib/hotspot-tools java \
+ -C lib/hotspot-tools javax ;
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -2175,14 +2127,8 @@ clean-tools-jar: clean-hotspot-tools
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ;
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
@@ -2259,6 +2205,6 @@ clean: distclean-local
jtreg: stamps/jtreg.stamp
-plugin: $(ICEDTEAPLUGIN_TARGET)
+plugin: stamps/plugin.stamp
plugin-tests: stamps/plugin-tests.stamp
diff -r bb0e039df90a -r ec2ae0d51146 patches/icedtea-6920143-using-with-mouse.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6920143-using-with-mouse.patch Sat Jan 30 01:38:48 2010 +0000
@@ -0,0 +1,45 @@
+6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync()
+Summary: Added small delay to make sure that TextArea animation have finished
+Reviewed-by: anthony
+
+--- openjdk.orig/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java 2010-01-27 14:45:28.000000000 +0100
++++ openjdk/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java 2010-01-27 14:45:27.000000000 +0100
+@@ -56,6 +56,7 @@
+ TextArea textArea;
+ Robot robot;
+ final int desiredSelectionEnd = ('z'-'a'+1)*2; // 52
++ final static int SCROLL_DELAY = 100; // ms
+
+ public void start () {
+ createObjects();
+@@ -126,6 +127,8 @@
+
+ moveMouseBelowTextArea( tremble%2!=0 );
+ Util.waitForIdle( robot );
++ // it is needed to add some small delay on Gnome
++ waitUntilScrollIsPerformed(robot);
+ }
+
+ robot.mouseRelease( MouseEvent.BUTTON1_MASK );
+@@ -141,9 +144,19 @@
+ void moveMouseBelowTextArea( boolean shift ) {
+ Dimension d = textArea.getSize();
+ Point l = textArea.getLocationOnScreen();
++ int x = (int)(l.x+d.width*.5);
+ int y = (int)(l.y+d.height*1.5);
+ if( shift ) y+=15;
+- robot.mouseMove( (int)(l.x+d.width*.5), y );
++ robot.mouseMove( x, y );
++ }
++
++ void waitUntilScrollIsPerformed(Robot robot) {
++ try {
++ Thread.sleep( SCROLL_DELAY );
++ }
++ catch( Exception e ) {
++ throw new RuntimeException( e );
++ }
+ }
+
+ void checkResults() {
+
diff -r bb0e039df90a -r ec2ae0d51146 patches/icedtea-6920172-location-relative-to-test.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6920172-location-relative-to-test.patch Sat Jan 30 01:38:48 2010 +0000
@@ -0,0 +1,27 @@
+6920172: Regression test LocationRelativeToTest does not check frame position correctly.
+Summary: Testcase correction - check frame position against graphics environment's center point
+Reviewed-by: art
+
+--- openjdk.orig/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java 2010-01-25 17:42:52.000000000 +0100
++++ openjdk/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java 2010-01-25 17:42:52.000000000 +0100
+@@ -50,7 +50,8 @@
+
+ GraphicsEnvironment ge =
+ GraphicsEnvironment.getLocalGraphicsEnvironment();
+- System.out.println("Center point: " + ge.getCenterPoint());
++ Point centerPoint = ge.getCenterPoint();
++ System.out.println("Center point: " + centerPoint);
+ GraphicsDevice[] gds = ge.getScreenDevices();
+ GraphicsDevice gdDef = ge.getDefaultScreenDevice();
+ GraphicsConfiguration gcDef =
+@@ -77,8 +78,7 @@
+ // second, check setLocationRelativeTo(invisible)
+ f.setLocationRelativeTo(f2);
+ Util.waitForIdle(r);
+- checkLocation(f, new Point(gcBounds.x + gcBounds.width / 2,
+- gcBounds.y + gcBounds.height / 2));
++ checkLocation(f, centerPoint);
+
+ // third, check setLocationRelativeTo(visible)
+ f2.setVisible(true);
+
diff -r bb0e039df90a -r ec2ae0d51146 patches/icedtea-6920172-turkish.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6920172-turkish.patch Sat Jan 30 01:38:48 2010 +0000
@@ -0,0 +1,14 @@
+6917663: test/java/security/Provider/Turkish.java not samevm friendly
+Summary: Added othervm flag to ensure that this test will run in isolation.
+Reviewed-by: alanb
+
+--- openjdk.orig/jdk/test/java/security/Provider/Turkish.java 2010-01-18 11:02:18.000000000 +0100
++++ openjdk/jdk/test/java/security/Provider/Turkish.java 2010-01-18 11:02:17.000000000 +0100
+@@ -25,6 +25,7 @@
+ * @test
+ * @bug 6220064
+ * @summary make sure everything works ok in the Turkish local (dotted/dotless i problem)
++ * @run main/othervm Turkish
+ * @author Andreas Sterbenz
+ */
+
diff -r bb0e039df90a -r ec2ae0d51146 ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Wed Jan 27 17:52:01 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Sat Jan 30 01:38:48 2010 +0000
@@ -303,6 +303,7 @@ extern "C" void Helper_RaiseIllegalMonit
extern "C" void Helper_RaiseIllegalMonitorException(JavaThread *thread)
{
HandleMark __hm(thread);
+ thread->clear_pending_exception();
InterpreterRuntime::throw_illegal_monitor_state_exception(thread);
}
diff -r bb0e039df90a -r ec2ae0d51146 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jan 27 17:52:01 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Sat Jan 30 01:38:48 2010 +0000
@@ -64,6 +64,9 @@
#ifndef DISABLE_HW_FP
#define HW_FP
#endif
+
+#define LEAF_STACK_SIZE 200
+#define STACK_SPARE 40
#define stack r4
#define jpc r5
@@ -504,6 +507,7 @@ do_\label:
.text
+ .global cmpxchg_ptr
cmpxchg_ptr:
stmfd sp!, {r4, r5, r6, r7, r8, lr}
mov r6, #0xffffffc0
@@ -2316,7 +2320,7 @@ fast_normal_entry_synchronized:
ldr r3, [tmp1, #THREAD_JAVA_STACK_BASE]
More information about the distro-pkg-dev
mailing list