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

8272291: mark hotspot runtime/logging tests which ignore external VM flags #2388

Closed
wants to merge 1 commit into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Dec 14, 2023

Backport of JDK-8272291

Unclean Backport:

  • test/hotspot/jtreg/runtime/logging/CondyIndyTest.java
    • This file has been skipped since it does not exist yet
    • This file was added via JDK-8210012 since Java 15
  • test/hotspot/jtreg/runtime/logging/ExceptionsTest.java
    • The only difference is the Copyright year part. Manually merged.
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/ItablesTest.java
    • The base line are different, so auto merge not succeed
    • Manually mereged, with exaclty the same coding logic
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/ModulesTest.java
    • The only difference is the Copyright year part. Manually merged.
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/MonitorInflationTest.java
    • The base line are different, so auto merge not succeed
    • Manually mereged, with exaclty the same coding logic
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/SafepointCleanupTest.java
    • The only difference is the Copyright year part. Manually merged.
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/SafepointTest.java
    • The only difference is the Copyright year part. Manually merged.
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/VerificationTest.java
    • The base line are different, so auto merge not succeed
    • Manually mereged, with exaclty the same coding logic
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/VtablesTest.java
    • The base line are different, so auto merge not succeed
    • Manually mereged, with exaclty the same coding logic
    • This file can be considered as Clean backport
  • test/hotspot/jtreg/runtime/logging/loadLibraryTest/LoadLibraryTest.java
    • This file has been skipped since it does not exist yet
    • This file was added via JDK-8187305 since Java 15

Tests

  • Test Succeeded in local Dev Apple M1 Laptop
  • PR: All checks have passed
  • SAP nightlies passed on 2023-12-23,24

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
  • JDK-8272291 needs maintainer approval

Issue

  • JDK-8272291: mark hotspot runtime/logging tests which ignore external VM flags (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2388

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 14, 2023

👋 Welcome back ashi! 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 05d64da7f32e5960550d5ec76fa2fba5c972d9b3 8272291: mark hotspot runtime/logging tests which ignore external VM flags Dec 14, 2023
@openjdk
Copy link

openjdk bot commented Dec 14, 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 Dec 14, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 14, 2023

Webrevs

@amosshi
Copy link
Contributor Author

amosshi commented Dec 15, 2023

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. Unclean backport. SAP nightlies passed on 2023-12-19”

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

@amosshi
8272291: The approval request has been created successfully.

@openjdk openjdk bot added approval and removed approval labels Dec 15, 2023
@amosshi
Copy link
Contributor Author

amosshi commented Dec 18, 2023

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. Unclean back port. SAP nightlies passed on 2023-12-19”

@openjdk
Copy link

openjdk bot commented Dec 18, 2023

@amosshi
8272291: The approval request has been updated successfully.

@openjdk openjdk bot added approval and removed approval labels Dec 18, 2023
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.

LGTM. Thanks for your explanations including references to tests which are not backported to 11u.

@openjdk
Copy link

openjdk bot commented Dec 21, 2023

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

@amosshi
Copy link
Contributor Author

amosshi commented Dec 24, 2023

/approval request “Backporting for parity with jdk 11.0.22-oracle. No risk, test fix. Unclean back port. SAP nightlies passed on 2023-12-23”

@openjdk
Copy link

openjdk bot commented Dec 24, 2023

@amosshi
8272291: The approval request has been updated successfully.

@openjdk openjdk bot added the approval label Dec 24, 2023
@openjdk
Copy link

openjdk bot commented Dec 24, 2023

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

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

8272291: mark hotspot runtime/logging tests which ignore external VM flags

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

  • b714f1e: 8208278: [mlvm] [TESTBUG] vm.mlvm.mixed.stress.java.findDeadlock.INDIFY_Test Deadlocked threads are not always detected
  • b90b1d2: 8318889: C2: add bailout after assert Bad graph detected in build_loop_late
  • 73e40c9: 8317327: Remove JT_JAVA dead code in jib-profiles.js
  • 6a5a8ee: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • 1583c4e: 8308223: failure handler missed jcmd.vm.info command
  • 5571faf: 8300727: java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java failed with "List wasn't garbage collected"
  • 9cff0d4: 8302109: Trivial fixes to btree tests
  • 92534aa: 8289948: Improve test coverage for XPath functions: Node Set Functions
  • 53824e5: 8313816: Accessing jmethodID might lead to spurious crashes
  • b6e6d38: 8067651: LevelTransitionTest.java, fix trivial methods levels logic
  • ... and 63 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Dec 24, 2023
@amosshi
Copy link
Contributor Author

amosshi commented Dec 25, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 25, 2023
@openjdk
Copy link

openjdk bot commented Dec 25, 2023

@amosshi
Your change (at version 1ea9740) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Dec 25, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 25, 2023

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

  • b8e0b56: 8226910: make it possible to use jtreg's -match via run-test framework
  • b714f1e: 8208278: [mlvm] [TESTBUG] vm.mlvm.mixed.stress.java.findDeadlock.INDIFY_Test Deadlocked threads are not always detected
  • b90b1d2: 8318889: C2: add bailout after assert Bad graph detected in build_loop_late
  • 73e40c9: 8317327: Remove JT_JAVA dead code in jib-profiles.js
  • 6a5a8ee: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • 1583c4e: 8308223: failure handler missed jcmd.vm.info command
  • 5571faf: 8300727: java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java failed with "List wasn't garbage collected"
  • 9cff0d4: 8302109: Trivial fixes to btree tests
  • 92534aa: 8289948: Improve test coverage for XPath functions: Node Set Functions
  • 53824e5: 8313816: Accessing jmethodID might lead to spurious crashes
  • ... and 64 more: https://git.openjdk.org/jdk11u-dev/compare/e793bdd174ad976f567d0d911db42f67f6d7e59d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 25, 2023

@GoeLin @amosshi Pushed as commit d7eeb39.

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

@amosshi amosshi deleted the backport-8272291 branch December 25, 2023 20:00
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