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

8215568: Refactor SA clhsdb tests to use ClhsdbLauncher #381

Closed
wants to merge 1 commit into from

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 20, 2021

Hi,
I downport this for parity with 11.0.13-oracle.

In the following files, I had to resolve removal of import of Platform.java:
ClhsdbJstack.java ClhsdbPmap.java ClhsdbPrintStatics.java ClhsdbPstack.java ClhsdbWhere.java

ClhsdbRegionDetailsScanOopsForG1.java was moved to resourcehogs, I applied the change there.

TestIntConstant.java is completely reworked by this change. The patch did not
apply, but was trivial to resolve.


Progress

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

Issue

  • JDK-8215568: Refactor SA clhsdb tests to use ClhsdbLauncher

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 381

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 20, 2021

👋 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.

Loading

@openjdk openjdk bot changed the title Backport 9c09bb98d401e7cd7394c411c9f6f59189137646 8215568: Refactor SA clhsdb tests to use ClhsdbLauncher Sep 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 20, 2021

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 20, 2021

Webrevs

Loading

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Thanks for the detailed resolution description.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2021

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

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

8215568: Refactor SA clhsdb tests to use ClhsdbLauncher

Refactoring the SA tests which test clhsdb commands to use ClhsdbLauncher for uniformity and ease of maintainence

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

  • d78b4c7: 8233403: Improve verbosity of some httpclient tests
  • 8c2cecc: 8165828: [TEST_BUG] The reg case:javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java failed as No Metal Look and Feel
  • 52c1288: Merge
  • f336c72: 8273939: Backport of 8248414 to JDK11 breaks MacroAssembler::adrp
  • 8fc3d89: 8221259: New tests for java.net.Socket to exercise long standing behavior
  • 16ef602: 8217438: Adapt tools//launcher/Test7029048.java for AIX
  • ae849c1: 8080569: java/lang/ProcessBuilder/DestroyTest.java fails with "RuntimeException: Process terminated prematurely"
  • 62207ef: 8261297: NMT: Final report should use scale 1
  • 005b8b9: 8217882: java/net/httpclient/MaxStreams.java failed once
  • a13296f: 8217903: java/net/httpclient/Response204.java fails with 404
  • ... and 9 more: https://git.openjdk.java.net/jdk11u-dev/compare/ef061756056ede5bd244954c2ba166d22d034ab4...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Sep 22, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Sep 23, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

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

  • b9307bd: 8214469: [macos] PIT: java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java fails
  • 86cf496: 8222446: assert(C->env()->system_dictionary_modification_counter_changed()) failed: Must invalidate if TypeFuncs differ
  • 0405d46: 8233634: [TESTBUG] Swing text test bug4278839.java fails on macos
  • 133de42: 8228508: [TESTBUG] java/net/httpclient/SmokeTest.java fails on Windows7
  • d78b4c7: 8233403: Improve verbosity of some httpclient tests
  • 8c2cecc: 8165828: [TEST_BUG] The reg case:javax/swing/plaf/metal/MetalIcons/MetalHiDPIIconsTest.java failed as No Metal Look and Feel
  • 52c1288: Merge
  • f336c72: 8273939: Backport of 8248414 to JDK11 breaks MacroAssembler::adrp
  • 8fc3d89: 8221259: New tests for java.net.Socket to exercise long standing behavior
  • 16ef602: 8217438: Adapt tools//launcher/Test7029048.java for AIX
  • ... and 13 more: https://git.openjdk.java.net/jdk11u-dev/compare/ef061756056ede5bd244954c2ba166d22d034ab4...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Sep 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@GoeLin Pushed as commit 43861d7.

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

Loading

@GoeLin GoeLin deleted the backport_8215568-2 branch Sep 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants