Skip to content

Conversation

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jan 28, 2025

We currently skip 4 failing lighting tests on macOS 14 / aarch64. Those same tests fail on macOS 15 now, so this modifies the check used to skip those tests to macOS 14 or later / aarch64.

I'll run a CI test build on macOS 15 with this fix and the fix in PR #1685.


Progress

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

Issue

  • JDK-8348895: [testbug] Skip failing 3D lighting tests on macOS 14 or later on aarch64 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1686

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1686.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 28, 2025

👋 Welcome back kcr! 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
Copy link

openjdk bot commented Jan 28, 2025

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

8348895: [testbug] Skip failing 3D lighting tests on macOS 14 or later on aarch64

Reviewed-by: arapte, jdv

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

  • 2b5b113: 8348736: RichTextArea clamp and getText
  • f55f5c6: 8348744: Application window not always activated on macOS 15

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@kevinrushforth kevinrushforth marked this pull request as ready for review January 29, 2025 00:04
@kevinrushforth
Copy link
Member Author

With this fix and the fix for JDK-8319066 all test pass on macOS 15 / aarch64 (as well as continuing to pass on other platforms).

@openjdk openjdk bot added the rfr Ready for review label Jan 29, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 29, 2025

Webrevs

@kevinrushforth
Copy link
Member Author

kevinrushforth commented Jan 29, 2025

@jperedadnr or @andy-goryachev-oracle can one of you review this clean backport?

wrong PR

@kevinrushforth
Copy link
Member Author

Reviewer: @arapte

@jayathirthrao You might also want to take a look.

Copy link
Member

@arapte arapte 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 openjdk bot added the ready Ready to be integrated label Jan 29, 2025
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 29, 2025

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

  • 2b5b113: 8348736: RichTextArea clamp and getText
  • f55f5c6: 8348744: Application window not always activated on macOS 15

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 29, 2025
@openjdk openjdk bot closed this Jan 29, 2025
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jan 29, 2025
@openjdk
Copy link

openjdk bot commented Jan 29, 2025

@kevinrushforth Pushed as commit 98b4b2e.

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

@kevinrushforth
Copy link
Member Author

/backport :jfx24

@openjdk
Copy link

openjdk bot commented Jan 29, 2025

@kevinrushforth the backport was successfully created on the branch backport-kevinrushforth-98b4b2e1-jfx24 in my personal fork of openjdk/jfx. To create a pull request with this backport targeting openjdk/jfx:jfx24, 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 98b4b2e1 from the openjdk/jfx repository.

The commit being backported was authored by Kevin Rushforth on 29 Jan 2025 and was reviewed by Ambarish Rapte and Jayathirth D V.

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/jfx:

$ git fetch https://github.com/openjdk-bots/jfx.git backport-kevinrushforth-98b4b2e1-jfx24:backport-kevinrushforth-98b4b2e1-jfx24
$ git checkout backport-kevinrushforth-98b4b2e1-jfx24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jfx.git backport-kevinrushforth-98b4b2e1-jfx24

@kevinrushforth kevinrushforth deleted the 8348895-skip-lighting-tests branch January 29, 2025 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants