Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8275234: java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java is en… 
…tered twice in ProblemList

Reviewed-by: serb, pbansal
  • Loading branch information
@lawrence-andrew @mrserb
lawrence-andrew authored and mrserb committed Oct 13, 2021
1 parent d15fbc2 commit 1e0184d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions test/jdk/ProblemList.txt
View file
Expand Up @@ -503,7 +503,7 @@ java/awt/Frame/DisposeParentGC/DisposeParentGC.java 8079786 macosx-all
java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java 8169468 macosx-all
java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java 8213120 macosx-all

java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java 7099223 linux-all,windows-all
java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java 7099223,8274106 macosx-aarch64,linux-all,windows-all
java/awt/Window/WindowResizing/DoubleClickTitleBarTest.java 8233557 macosx-all
java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.java 8233558 macosx-all
java/awt/keyboard/AllKeyCode/AllKeyCode.java 8242930 macosx-all
Expand Down Expand Up @@ -750,7 +750,6 @@ javax/swing/JButton/8151303/PressedIconTest.java 8266246 macosx-aarch64
javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 8273573 macosx-all

# Several tests which fail on some hidpi systems
java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java 8274106 macosx-aarch64
java/awt/Window/8159168/SetShapeTest.java 8274106 macosx-aarch64
java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 macosx-aarch64
javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java 8274106 macosx-aarch64
Expand Down

7 comments on commit 1e0184d

@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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 1e0184d Sep 22, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1e0184d Sep 22, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-1e0184d1 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1e0184d1 from the openjdk/jdk repository.

The commit being backported was authored by lawrence.andrews on 13 Oct 2021 and was reviewed by Sergey Bylokhov and Pankaj Bansal.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-1e0184d1:GoeLin-backport-1e0184d1
$ git checkout GoeLin-backport-1e0184d1
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-1e0184d1

@sendaoYan
Copy link
Contributor

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 1e0184d Feb 2, 2023

Choose a reason for hiding this comment

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

@sendaoYan To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

@y1yang0
Copy link
Member

@y1yang0 y1yang0 commented on 1e0184d Feb 2, 2023

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 1e0184d Feb 2, 2023

Choose a reason for hiding this comment

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

@y1yang0 Could not automatically backport 1e0184d1 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 y1yang0-backport-1e0184d1

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

# Backport the commit
$ git cherry-pick --no-commit 1e0184d142deb18e719fc28814a293b44bab6c63
# Resolve conflicts now

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

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

Please sign in to comment.