Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM #2245

Closed
wants to merge 1 commit into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Feb 27, 2024

Backport of JDK-8266242

  • src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m - clean backport
  • test/jdk/ProblemList.txt - this file has been ignored because the line does not exist

Testing

  • Local: Test passed
    • CheckDisplayModes.java: Test results: passed: 1
MacBook Pro
16-inch, 2021
Chip Apple M1 Max
Memory: 32 GB
MacOS: 14.3.1 (23D60)
  • Pipeline: All checks have passed
  • Testing Machine: SAP nightlies passed on 2024-03-01,02,03

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8266242 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2245/head:pull/2245
$ git checkout pull/2245

Update a local copy of the PR:
$ git checkout pull/2245
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2245/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2245

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2245.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 27, 2024

👋 Welcome back ashi! A progress list of the required criteria for merging this PR into master 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 f7d6d7a04faa704155ee8df33e7d344bb962566f 8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM Feb 27, 2024
@openjdk
Copy link

openjdk bot commented Feb 27, 2024

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Feb 27, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 27, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 8, 2024

⚠️ @amosshi This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@amosshi
Copy link
Contributor Author

amosshi commented Mar 8, 2024

/approval request “Backporting for parity with jdk 17.0.12-oracle. Un-Clean backport, well changes on file CGraphicsDevice.m are clean. JDK code change, not only test case. SAP nightlies passed on 2024-03-01,02,03”

@openjdk
Copy link

openjdk bot commented Mar 8, 2024

@amosshi
8266242: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Mar 8, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

@amosshi 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:

8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM

Reviewed-by: mdoerr

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 32 new commits pushed to the master branch:

  • f221ff3: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 08f1b35: 8320712: Rewrite BadFactoryTest in pure Java
  • 6e73b11: 8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on CentOS Linux release 8.5.2111 and Fedora 27
  • 48327c3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • fa8a159: 8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 3c05a02: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • f423686: 8325972: Add -x to bash for building with LOG=debug
  • 385731f: 8320303: Allow PassFailJFrame to accept single window creator
  • 30ead33: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • 5421bb6: 8278893: Parallel: Remove GCWorkerDelayMillis
  • ... and 22 more: https://git.openjdk.org/jdk17u-dev/compare/39c9e9d2bf82cd85dc7d47031b71e97574533fe7...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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. Possible candidates are the reviewers of this PR (@TheRealMDoerr) but any other Committer may sponsor as well.

➡️ 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 ready Pull request is ready to be integrated and removed approval labels Mar 11, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Mar 11, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 11, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

@amosshi
Your change (at version 2628fd3) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

Going to push as commit 4ba565c.
Since your change was applied there have been 36 commits pushed to the master branch:

  • e148b99: 8317287: [macos14] InterJVMGetDropSuccessTest.java: Child VM: abnormal termination
  • 61fed7b: 8315677: Open source few swing JFileChooser and other tests
  • f196e02: 8325137: com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java can fail in Xcomp with out of expected range
  • 833e2bb: 8291753: Add JFR event for GC CPU Time
  • f221ff3: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 08f1b35: 8320712: Rewrite BadFactoryTest in pure Java
  • 6e73b11: 8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on CentOS Linux release 8.5.2111 and Fedora 27
  • 48327c3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • fa8a159: 8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 3c05a02: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • ... and 26 more: https://git.openjdk.org/jdk17u-dev/compare/39c9e9d2bf82cd85dc7d47031b71e97574533fe7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 11, 2024

@shipilev @amosshi Pushed as commit 4ba565c.

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

@amosshi amosshi deleted the backport-8266242 branch March 13, 2024 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants