Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk19u Public archive

8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java #90

Closed
wants to merge 1 commit into from

Conversation

Rudometov
Copy link
Member

@Rudometov Rudometov commented Nov 22, 2022

Backport for
JDK-8297153 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again
JDK-8297241 Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java

Original commit: openjdk/jdk@3c09498

Clean backport.
Fixing unstable test.
Checked on mac and linux by running:
make run-test TEST="test/jdk/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java"

This PR depends on #89


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issues

  • JDK-8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java
  • JDK-8297153: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk19u pull/90/head:pull/90
$ git checkout pull/90

Update a local copy of the PR:
$ git checkout pull/90
$ git pull https://git.openjdk.org/jdk19u pull/90/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 90

View PR using the GUI difftool:
$ git pr show -t 90

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk19u/pull/90.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2022

👋 Welcome back vrudomet! A progress list of the required criteria for merging this PR into pr/89 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 3c0949824e06f2b3d44f1bde9d2292a7627b0197 8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java Nov 22, 2022
@openjdk
Copy link

openjdk bot commented Nov 22, 2022

This backport pull request has now been updated with issues from the original commit.

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Nov 22, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2022

Webrevs

@Rudometov
Copy link
Member Author

/integrate

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 23, 2022

@Rudometov This pull request has not yet been marked as ready for integration.

@openjdk
Copy link

openjdk bot commented Nov 23, 2022

@phohensee The change author (@Rudometov) must issue an integrate command before the integration can be sponsored.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/89 to master November 23, 2022 18:15
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8297153
git fetch https://git.openjdk.org/jdk19u master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Nov 23, 2022
@Rudometov
Copy link
Member Author

/clean

@openjdk openjdk bot added the clean label Nov 23, 2022
@openjdk
Copy link

openjdk bot commented Nov 23, 2022

@Rudometov This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java
8297153: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 23, 2022
@openjdk
Copy link

openjdk bot commented Nov 23, 2022

@Rudometov Only OpenJDK Committers can use the /clean command

…enRenderingResizeTest.java

8297153: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again

Reviewed-by: serb
(cherry picked from commit 3c0949824e06f2b3d44f1bde9d2292a7627b0197)
@Rudometov
Copy link
Member Author

/integrate

@openjdk-notifier
Copy link

@Rudometov Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 23, 2022
@openjdk
Copy link

openjdk bot commented Nov 23, 2022

@Rudometov
Your change (at version 79ab864) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 24, 2022

Going to push as commit 677a7c4.
Since your change was applied there have been 2 commits pushed to the master branch:

  • a370758: 8296945: PublicMethodsTest is slow due to dependency verification with debug builds
  • 6615c05: 8296957: One more cast in SAFE_SIZE_NEW_ARRAY2

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 24, 2022
@openjdk openjdk bot closed this Nov 24, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 24, 2022
@openjdk openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 24, 2022
@openjdk
Copy link

openjdk bot commented Nov 24, 2022

@RealCLanger @Rudometov Pushed as commit 677a7c4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants