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

8292717: Clean up checking of testing requirements in configure #2600

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 12, 2024

I backport this because then 8314495 can be backported clean. Also brings 11 closer to 17.

configure.ac::
I had to resolve two chunks. In one, I needed to omit the coding for JMH which is not
supported by 11.

jdk-options.m4, toolchanin.m4
Deleted function has different body, deleted by hand.

lib-tests.m4: Copyright.

The original change moves and renames three
functions to lib-tests.m4. It does not change
the implementation of these.
So I modified the added code in lib-tests.m4
to have the unchanged function bodies that
were deleted in the other files.


Progress

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

Issue

  • JDK-8292717: Clean up checking of testing requirements in configure (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2600

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 2024

👋 Welcome back goetz! 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.

@GoeLin GoeLin force-pushed the goetz_backport_8292717 branch from feb0118 to 2b85a35 Compare March 12, 2024 18:59
@GoeLin GoeLin changed the title Goetz backport 8292717 and 8314495 Backport 16593cf51c3d994ba4a6d28ab97e519dfd53f37b Mar 12, 2024
@openjdk openjdk bot changed the title Backport 16593cf51c3d994ba4a6d28ab97e519dfd53f37b 8292717: Clean up checking of testing requirements in configure Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

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

@openjdk openjdk bot added the backport label Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

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

8292717: Clean up checking of testing requirements in configure

Reviewed-by: shade, 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 8 new commits pushed to the master branch:

  • 7ed3c3e: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • d1bdb25: 8322239: [macos] a11y : java.lang.NullPointerException is thrown when focus is moved on the JTabbedPane
  • 2921ad6: 8321489: Update LCMS to 2.16
  • 0f09d0b: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 1d102e8: 8248667: Need support for building native libraries located in the test/lib directory
  • 7de6f3f: 8314283: Support for NSS tests on aarch64 platforms
  • a097faa: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
  • 1b3c570: 8290203: ProblemList vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java on linux-all

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.

@GoeLin GoeLin marked this pull request as ready for review March 15, 2024 08:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 15, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 15, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2024

Hi @shipilev,

I figured it works smoothest if I backport in the order they arrived in 17.
So I handled this one now. You might want to have a look, should be familiar :)

Best, Goetz.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

This looks fine, thanks. It is generally hard to check that we have not introduced bugs while doing these move, but as long as they are mostly mechanical, I think we are safer.

I don't see the JTREG_MINIMUM_VERSION=6.1 hunk in the original commit (openjdk/jdk@16593cf), but I guess we need to move it from toolchain.m4 for 11u-dev.

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.

I think it's good. Feel free to add the empty line.

@openjdk
Copy link

openjdk bot commented Mar 18, 2024

⚠️ @GoeLin 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.

@openjdk openjdk bot added the approval label Mar 18, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 19, 2024

GHA failure: StringRepeat.java: Could not reserve enough space for 2097152KB object heap

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 19, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 19, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 19, 2024

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

  • 7ed3c3e: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • d1bdb25: 8322239: [macos] a11y : java.lang.NullPointerException is thrown when focus is moved on the JTabbedPane
  • 2921ad6: 8321489: Update LCMS to 2.16
  • 0f09d0b: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 1d102e8: 8248667: Need support for building native libraries located in the test/lib directory
  • 7de6f3f: 8314283: Support for NSS tests on aarch64 platforms
  • a097faa: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
  • 1b3c570: 8290203: ProblemList vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java on linux-all

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 19, 2024

@GoeLin Pushed as commit cb1b9a6.

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

@GoeLin GoeLin deleted the goetz_backport_8292717 branch March 19, 2024 14:38
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
Development

Successfully merging this pull request may close these issues.

3 participants