Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8196086: java/awt/image/DrawImage/IncorrectSourceOffset.java fails 
Reviewed-by: shade
  • Loading branch information
@mrserb
mrserb committed Nov 28, 2020
1 parent 65137ff commit 1241f80
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
5 changes: 1 addition & 4 deletions test/jdk/ProblemList.txt
View file
Expand Up @@ -250,10 +250,7 @@ java/awt/font/TextLayout/TextLayoutBounds.java 8169188 generic-all
java/awt/font/StyledMetrics/BoldSpace.java 8198422 linux-all
java/awt/FontMetrics/FontCrash.java 8198336 windows-all
java/awt/image/BufferedImage/ICMColorDataTest/ICMColorDataTest.java 8233028 generic-all
java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java 8056077 generic-all
java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java 8196025 windows-all
java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java 8196025 windows-all
java/awt/image/DrawImage/IncorrectSourceOffset.java 8196086 windows-all
java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java 8056077 linux-all
java/awt/image/DrawImage/BlitRotateClippedArea.java 8255724 linux-all
java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java 8198390 generic-all
java/awt/image/multiresolution/MultiresolutionIconTest.java 8169187 macosx-all,windows-all
Expand Down
5 changes: 4 additions & 1 deletion test/jdk/java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java
View file
Expand Up @@ -47,7 +47,10 @@
* @summary Tests drawing transparent volatile image to transparent BI.
* Results of the blit compatibleImage to transparent BI used for
* comparison.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=3 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectAlphaSurface2SW
*/
public final class IncorrectAlphaSurface2SW {

Expand Down
4 changes: 3 additions & 1 deletion test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java
View file
Expand Up @@ -48,7 +48,9 @@
* @bug 8061456
* @summary Tests drawing BI to volatile image using different clips + xor mode.
* Results of the blit BI to compatibleImage is used for comparison.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectClipXorModeSW2Surface
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectClipXorModeSW2Surface
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectClipXorModeSW2Surface
*/
public final class IncorrectClipXorModeSW2Surface {

Expand Down
3 changes: 3 additions & 0 deletions test/jdk/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java
View file
Expand Up @@ -45,6 +45,9 @@
* @summary Tests drawing volatile image to volatile image using different
* clips + xor mode. Results of the blit compatibleImage to
* compatibleImage is used for comparison.
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectClipXorModeSurface2Surface
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectClipXorModeSurface2Surface
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectClipXorModeSurface2Surface
*/
public final class IncorrectClipXorModeSurface2Surface {

Expand Down
5 changes: 4 additions & 1 deletion test/jdk/java/awt/image/DrawImage/IncorrectSourceOffset.java
View file
Expand Up @@ -39,7 +39,10 @@
* @key headful
* @bug 8041129
* @summary Tests asymmetric source offsets.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=3 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectSourceOffset
*/
public final class IncorrectSourceOffset {

Expand Down

3 comments on commit 1241f80

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 1241f80 Dec 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1241f80 Dec 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb Could not automatically backport 1241f800 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/ProblemList.txt

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b mrserb-backport-1241f800

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 1241f800023996d33b39a2b881b2bf7e3b7201c3

# Backport the commit
$ git cherry-pick --no-commit 1241f800023996d33b39a2b881b2bf7e3b7201c3
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 1241f800023996d33b39a2b881b2bf7e3b7201c3'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 1241f800023996d33b39a2b881b2bf7e3b7201c3.

Please sign in to comment.