Mercurial > hg > release > icedtea6-1.10

changeset 2265:fd77bd063119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correction of testcase sun/java2d/DirectX/OnScreenringResizeTest/OnScreenRenderingResizeTest.java.
author ptisnovs
date Tue, 21 Sep 2010 11:11:45 +0200
parents 2fa7aed828ed
children e4c712442cf1
files ChangeLog Makefile.am patches/openjdk/6984543-onscreen_rendering_resize_test.patch
diffstat 3 files changed, 39 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 20 20:48:54 2010 +0100
+++ b/ChangeLog	Tue Sep 21 11:11:45 2010 +0200
@@ -1,3 +1,10 @@
+2010-09-21  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am:
+	Add new patch.
+	* patches/openjdk/6984543-onscreen_rendering_resize_test.patch:
+	Testcase correction.
+
 2010-09-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Sep 20 20:48:54 2010 +0100
+++ b/Makefile.am	Tue Sep 21 11:11:45 2010 +0200
@@ -338,7 +338,8 @@
 	patches/openjdk/6307603-xrender-01.patch \
 	patches/openjdk/6961633-xrender-02.patch \
         patches/openjdk/6791612-opengl-jni-fix.patch \
-        patches/openjdk/6755274-glgetstring-crash.patch
+        patches/openjdk/6755274-glgetstring-crash.patch \
+        patches/openjdk/6984543-onscreen_rendering_resize_test.patch
 endif
 
 if ENABLE_NIO2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6984543-onscreen_rendering_resize_test.patch	Tue Sep 21 11:11:45 2010 +0200
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User ptisnovs
+# Date 1284636320 -7200
+# Node ID 441e86ab3233112c3564210c7a669c295628a679
+# Parent  a248eb631aa22ab6f3a3487a679814940117dadc
+6984543: Test sun/java2d/DirectX/OnScreenRenderingResizeTest fails on GNOME
+Summary: Testcase correction.
+Reviewed-by: art
+
+diff -r a248eb631aa2 -r 441e86ab3233 test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java
+--- openjdk/jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest-old.java	2010-09-17 14:01:17.000000000 +0200
++++ openjdk/jdk/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java	2010-09-17 13:20:00.000000000 +0200
+@@ -157,7 +157,7 @@
+             if (cnt == 90 && robot != null) {
+                 // area where we blitted to should be either white or green
+                 Point p = frame.getLocationOnScreen();
+-                p.move(in.left+10, in.top+10);
++                p.translate(in.left+10, in.top+10);
+                 BufferedImage bi =
+                     robot.createScreenCapture(
+                         new Rectangle(p.x, p.y, IMAGE_W/2, IMAGE_H/2));
+@@ -166,7 +166,7 @@
+ 
+                 // the are where we didn't render should stay white
+                 p = frame.getLocationOnScreen();
+-                p.move(in.left, in.top+IMAGE_H+5);
++                p.translate(in.left, in.top+IMAGE_H+5);
+                 bi = robot.createScreenCapture(
+                     new Rectangle(p.x, p.y,
+                                   frame.getWidth()-in.left-in.right,