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

8246387: switch to jtreg 5.1 #103

Closed
wants to merge 5 commits into from
Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jul 6, 2021

This is a compound backport that brings the entire 11u to 5.1 b1. There are many dependencies thorough the repository history, so I opted to squash them together. It seems the 11.0.13-oracle backport exists only for this issue, which indicates Oracle maintainers did the same.

The current list of included patches is:

8246387: switch to jtreg 5.1
8238943: switch to jtreg 5.0
8235866: bump jtreg requiredVersion to 4.2b16
8219552: bump jtreg requiredVersion to b14 in test/jdk/sanity/client/
8219417: bump jtreg requiredVersion to b14
8236111: narrow allowSmartActionArgs disabling

Tested on Linux x86_64 fastdebug with jtreg5.1-b1 and the following test suites:

  • tier1
  • tier2
  • tier3
  • vmTestbase_nsk_jvmti
  • vmTestbase_vm_metaspace
  • vmTestbase_vm_defmeth
  • vmTestbase_vm_mlvm
  • vmTestbase_vm_compiler
  • vmTestbase_nsk_jvmti
  • vmTestbase_vm_metaspace
  • sanity/client

Progress

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

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/103/head:pull/103
$ git checkout pull/103

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 103

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/103.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 6, 2021

👋 Welcome back shade! 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 e47b2bc8c338a0b137106074952cded1067fc50a 8246387: switch to jtreg 5.1 Jul 6, 2021
@openjdk
Copy link

openjdk bot commented Jul 6, 2021

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

@openjdk openjdk bot added the backport label Jul 6, 2021
@shipilev shipilev marked this pull request as ready for review Jul 7, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 7, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 7, 2021

Webrevs

Copy link
Member

@phohensee phohensee left a comment

CDSTestUtils.java needs a copyright update to 2020.
All the TEST.properties files have an extra newline at their ends.

@shipilev
Copy link
Member Author

shipilev commented Aug 4, 2021

CDSTestUtils.java needs a copyright update to 2020.

Right, fixed.

All the TEST.properties files have an extra newline at their ends.

I don't follow. TEST.properties are from https://hg.openjdk.java.net/jdk/jdk/rev/1922c31f1dcc verbatim: two lines each.

Copy link
Member

@phohensee phohensee left a comment

The extra lines seem to be a webrev artifact. They're not in the diff, so lgtm.

@openjdk
Copy link

openjdk bot commented Aug 4, 2021

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

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

8246387: switch to jtreg 5.1
8238943: switch to jtreg 5.0
8235866: bump jtreg requiredVersion to 4.2b16
8219552: bump jtreg requiredVersion to b14 in test/jdk/sanity/client/
8219417: bump jtreg requiredVersion to b14
8236111: narrow allowSmartActionArgs disabling

Reviewed-by: phh, clanger

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.

➡️ 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 4, 2021
@RealCLanger
Copy link
Contributor

RealCLanger commented Aug 4, 2021

/issue add 8246387, 8238943, 8235866, 8219552, 8219417, 8236111

@openjdk
Copy link

openjdk bot commented Aug 4, 2021

@RealCLanger Only the author (@shipilev) is allowed to issue the /issue command.

@RealCLanger
Copy link
Contributor

RealCLanger commented Aug 4, 2021

@shipilev, I eyeballed the bugs you mentioned and then tried to mark them as solved in this PR. Obviously I'm not allowed to... can you do it?

@shipilev
Copy link
Member Author

shipilev commented Aug 5, 2021

/issue add 8246387, 8238943, 8235866, 8219552, 8219417, 8236111

@openjdk
Copy link

openjdk bot commented Aug 5, 2021

@shipilev This issue is referenced in the PR title - it will now be updated.

Adding additional issue to issue list: 8238943: switch to jtreg 5.0.

Adding additional issue to issue list: 8235866: bump jtreg requiredVersion to 4.2b16.

Adding additional issue to issue list: 8219552: bump jtreg requiredVersion to b14 in test/jdk/sanity/client/.

Adding additional issue to issue list: 8219417: bump jtreg requiredVersion to b14.

Adding additional issue to issue list: 8236111: narrow allowSmartActionArgs disabling.

@shipilev
Copy link
Member Author

shipilev commented Aug 5, 2021

@shipilev, I eyeballed the bugs you mentioned and then tried to mark them as solved in this PR. Obviously I'm not allowed to... can you do it?

Done. This would create the backport bugs for all of these, right? I thought we are going with a squashed commit to match only this 11.0.13-oracle. But either way, this would be good to report as proper history too.

@RealCLanger
Copy link
Contributor

RealCLanger commented Aug 5, 2021

@shipilev, I eyeballed the bugs you mentioned and then tried to mark them as solved in this PR. Obviously I'm not allowed to... can you do it?

Done. This would create the backport bugs for all of these, right? I thought we are going with a squashed commit to match only this 11.0.13-oracle. But either way, this would be good to report as proper history too.

Yes, this creates backport bugs for all of them. Although it's a squashed commit, which is good here, I think it's helpful to keep the history. One could argue that e.g. https://bugs.openjdk.java.net/browse/JDK-8219417 isn't necessary since nothing of this change remains after the squash (maybe there are others with the same effect).

Do you want me to run this through SAP's nightlies once? But if you're confident you can integrate it right away. I leave it to you...

@shipilev
Copy link
Member Author

shipilev commented Aug 5, 2021

Do you want me to run this through SAP's nightlies once? But if you're confident you can integrate it right away. I leave it to you...

Yes, please. I am in no rush to integrate, and have limited capacity to handle follow-up issues, so the more pre-integration testing, the merrier. Thanks!

@RealCLanger
Copy link
Contributor

RealCLanger commented Aug 6, 2021

Do you want me to run this through SAP's nightlies once? But if you're confident you can integrate it right away. I leave it to you...

Yes, please. I am in no rush to integrate, and have limited capacity to handle follow-up issues, so the more pre-integration testing, the merrier. Thanks!

Our testing went well. So 👍 from me.

@shipilev
Copy link
Member Author

shipilev commented Aug 6, 2021

Our testing went well. So from me.

Thank you, I'll arrange the push shortly. I picked up GHA from master in hopes it would provide more coverage, but I think bootstrap JDK downloads have a checksum bug: https://github.com/shipilev/jdk11u-dev/actions/runs/1103985012

@shipilev
Copy link
Member Author

shipilev commented Aug 6, 2021

GHA run is complete and green now: https://github.com/shipilev/jdk11u-dev/runs/3261042243 -- I'll integrate on Sunday night.

@shipilev
Copy link
Member Author

shipilev commented Aug 9, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Aug 9, 2021

Going to push as commit 5f9429b.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 4e32429: 8268427: Improve AlgorithmConstraints:checkAlgorithm performance

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 9, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 9, 2021
@openjdk
Copy link

openjdk bot commented Aug 9, 2021

@shipilev Pushed as commit 5f9429b.

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

@shipilev shipilev deleted the JDK-8246387 branch Aug 9, 2021
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