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

8217473: SA: Tests using ClhsdbLauncher fail on SAP docker containers #913

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 18, 2022

I backport this to improve testing and to fix the test bug in ClhsdbRegionDetailsScanOopsForG1.java.

I had to resolve the imports in the following files:

test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java

The hunk to ClhsdbRegionDetailsScanOopsForG1.java is left out.
The hunk was included accidentially when the test was move to resourcehogs.
This is also the cause of the failure of this test.


Progress

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

Issue

  • JDK-8217473: SA: Tests using ClhsdbLauncher fail on SAP docker containers

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 913

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/912 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 55369945b94003e96c841e5969add992a86c0156 8217473: SA: Tests using ClhsdbLauncher fail on SAP docker containers Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 18, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 18, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

Pre-submit failure: runtime/Thread/StopAtExit.java fixed in jdk11u

@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

@GoeLin This pull request has not yet been marked as ready for integration.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/912 to master March 18, 2022 12:48
@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 GoeLin-backport-86fcd475
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

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

8217473: SA: Tests using ClhsdbLauncher fail on SAP docker containers

Skip the test with jtreg.SkippedException if Platform.shouldSAAttach() returns false

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 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 Mar 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

Going to push as commit 8f3308a.

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

openjdk bot commented Mar 18, 2022

@GoeLin Pushed as commit 8f3308a.

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

@GoeLin GoeLin deleted the goetz_backport_8217473 branch March 18, 2022 12:53
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
Development

Successfully merging this pull request may close these issues.

2 participants