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

8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode #286

Closed
wants to merge 3 commits into from

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Mar 15, 2023

This is backport [1][2] which adds support for jtreg vm properties (vm.flavor, vm.compMode, vm.bits) for use in @requires

First commit is backport Itself.

Second commit switches some tests back to use @requires (2 are basically reverts [3][4] of jdk8u specific changes, 3rd updated test is not present in newer jdks [5][6])
These updated tests were used to test new properties, so I included them here. (However I can exclude them if requested)

Testing:
Updated tests are part of hotspot tier1, which is executed in GitHub (Which confirms it works).

[1] openjdk/jdk9u@24a9e0a
[2] openjdk/jdk9u@2b7a70a
[3] #222
[4] #182
[5] https://bugs.openjdk.org/browse/JDK-8154204
[6] #181


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 286

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 15, 2023

👋 Welcome back zzambers! 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 24a9e0ac188a37dc57cc4d1bb8d8635abb4c4f89 8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode Mar 15, 2023
@openjdk
Copy link

openjdk bot commented Mar 15, 2023

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 Mar 15, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 15, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

In DefaultUseWithClient, please remove line 41 (i.e., "// Skip this test on any other platform"the comment for the Windows client check) because it's redundant. Otherwise, looks fine.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This is supported with JTREG 4.1+. We use jtreg 5.1 minimum. So this seems fine (with changes suggested by Paul).

@openjdk
Copy link

openjdk bot commented Mar 16, 2023

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

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

8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode

Reviewed-by: phh, sgehwolf

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

  • d6f8151: 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary
  • a7fb08c: 8293815: P11PSSSignature.engineUpdate should not print debug messages during normal operation
  • 7c5d77c: Merge
  • 5806429: 8245654: Add Certigna Root CA
  • 3b80e87: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
  • 7c0d5b4: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 4a83729: 8303408: [AIX] Broken jdk8u build after JDK-8266391
  • eb2aee6: 8185736: missing default exception handler in calls to rethrow_Stub
  • 3d1fc4b: 8303462: Bump update version of OpenJDK: 8u382

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 Mar 16, 2023
@zzambers
Copy link
Contributor Author

In DefaultUseWithClient, please remove line 41 (i.e., "// Skip this test on any other platform"the comment for the Windows client check) because it's redundant. Otherwise, looks fine.

Fixed

@zzambers
Copy link
Contributor Author

zzambers commented Mar 16, 2023

This is supported with JTREG 4.1+. We use jtreg 5.1 minimum. So this seems fine (with changes suggested by Paul).

Btw. I have also tried to run this with jtreg-4.2-b16, vm properties in @requires worked as expected. (this jtreg version seems to have some problems with shell tests on windows) And I have also tried to run on windows with client vm, where DefaultUseWithClient ran as expected.

@zzambers
Copy link
Contributor Author

@phohensee @jerboaa thanks

@zzambers
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 21, 2023

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

  • ae6405f: 8289301: P11Cipher should not throw out of bounds exception during padding
  • ad41d90: 8293232: Fix race condition in pkcs11 SessionManager
  • d6f8151: 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary
  • a7fb08c: 8293815: P11PSSSignature.engineUpdate should not print debug messages during normal operation
  • 7c5d77c: Merge
  • 5806429: 8245654: Add Certigna Root CA
  • 3b80e87: 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked
  • 7c0d5b4: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 4a83729: 8303408: [AIX] Broken jdk8u build after JDK-8266391
  • eb2aee6: 8185736: missing default exception handler in calls to rethrow_Stub
  • ... and 1 more: https://git.openjdk.org/jdk8u-dev/compare/b51619d24e0643aa0afdba87ac20b371dbb594e8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 21, 2023

@zzambers Pushed as commit de0e5a2.

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

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