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

8292716: Configure should check that jtreg is of the required version #9965

Closed
wants to merge 3 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Aug 22, 2022

While reviewing the PR for JDK-8289798 (switching to jtreg 7) I realized that it would be better if configure checked if the provided jtreg is of the minimum required version.

This PR is dependent on #9964, so what you see here is a diff relative to that PR, and it can't be merged until that PR has been merged.


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-8292716: Configure should check that jtreg is of the required version

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9965

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9965.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 22, 2022

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into pr/9964 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 added the rfr Pull request is ready for review label Aug 22, 2022
@openjdk
Copy link

openjdk bot commented Aug 22, 2022

@magicus The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Aug 22, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 22, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/9964 to master August 22, 2022 13:13
@openjdk-notifier
Copy link

The dependent pull request 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 jtreg-version-check
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@erikj79
Copy link
Member

erikj79 commented Aug 22, 2022

Don't forget to bump the required version of jtreg before integrating.

@openjdk
Copy link

openjdk bot commented Aug 22, 2022

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

8292716: Configure should check that jtreg is of the required version

Reviewed-by: erikj

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

  • 8e8ee4b: 8292596: Make SymbolHashMap a ResourceHashtable
  • aa9b8f0: 8292043: Incorrect decoding near EOF for stateful decoders like UTF-16
  • f95ee79: 8292566: Add reference to the java.nio.file package in java.nio package documentation
  • 45c3e89: 8292316: Tests should not rely on specific JAR file names (jpackage)
  • db77227: 8282684: Obsolete UseContainerCpuShares and PreferContainerQuotaForCPUCount flags
  • 256b523: 8292381: java/net/httpclient/SpecialHeadersTest.java fails with "ERROR: Shutting down connection: HTTP/2 client stopped"

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 22, 2022
@magicus
Copy link
Member Author

magicus commented Aug 23, 2022

I coordinated with @sormuras so I push this first, and he update the minimum version in configure as part of #9393.

@magicus
Copy link
Member Author

magicus commented Aug 23, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2022

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

  • b4e1aa8: 8289658: Avoid redundant LinkedHashMap.get call in TagletManager.addNewSimpleCustomTag
  • 84936e9: 8292586: simplify cleanups in NTLMAuthSequence getCredentialsHandle
  • 259ba86: 8290075: [JVMCI] only blessed methods can link against EventWriterFactory.getEventWriter
  • a85a723: 8292351: tty should always live
  • 4da1745: 8291118: [vectorapi] Optimize the implementation of lanewise FIRST_NONZERO
  • 38a8191: 8290322: Optimize Vector.rearrange over byte vectors for AVX512BW targets.
  • 27af014: 8292743: Missing include resourceHash.hpp
  • f58aaab: 8292262: adjust timeouts in several M&M tests
  • ab69885: 8292215: java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java times out with slowdebug
  • 54843b7: 8290211: jdk/internal/vm/Continuation/Fuzz.java failed with "AssertionError: Failed to compile int Fuzz.com_int(int,int) in 5000ms"
  • ... and 7 more: https://git.openjdk.org/jdk/compare/e561933907bbab0a42f1796fa12f582b3a347312...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 23, 2022

@magicus Pushed as commit 486f90c.

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

@magicus magicus deleted the jtreg-version-check branch August 24, 2022 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
2 participants