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

8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target #16

Closed
wants to merge 1 commit into from

Conversation

dongbohe
Copy link
Member

@dongbohe dongbohe commented Mar 18, 2022

Hi,

I would like to backport this patch to fix test failure, introduced by JDK-8223396.

This is a clean backport on top of JDK-8223396 backport.

Test:

  • jdk_jfr

Progress

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

Issue

  • JDK-8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2022

👋 Welcome back dongbohe! 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 725da985e170d72c3ca3dc2dfbb3d7e083b5371a 8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target 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

@jerboaa
Copy link
Contributor

jerboaa commented Mar 18, 2022

@dongbohe Please target this PR to merge into pr/14 branch instead of master. I.e. mark this as a dependent PR. #14 needs to go in first anyway. See also https://mail.openjdk.java.net/pipermail/jdk-dev/2021-March/005232.html

@dongbohe dongbohe changed the base branch from master to pr/14 March 21, 2022 03:59
@dongbohe
Copy link
Member Author

@dongbohe Please target this PR to merge into pr/14 branch instead of master. I.e. mark this as a dependent PR. #14 needs to go in first anyway. See also https://mail.openjdk.java.net/pipermail/jdk-dev/2021-March/005232.html

done

@dongbohe
Copy link
Member Author

/clean

@openjdk
Copy link

openjdk bot commented Mar 21, 2022

@dongbohe Only OpenJDK Committers can use the /clean command

@jerboaa
Copy link
Contributor

jerboaa commented Mar 21, 2022

/clean

@openjdk openjdk bot added the clean label Mar 21, 2022
@openjdk
Copy link

openjdk bot commented Mar 21, 2022

@jerboaa This backport pull request is now marked as clean

@jerboaa
Copy link
Contributor

jerboaa commented Mar 21, 2022

@dongbohe Please add "Fix Request" comments to bugs you flag for approval. This one should get approved together with JDK-8223396.

@dongbohe
Copy link
Member Author

@dongbohe Please add "Fix Request" comments to bugs you flag for approval. This one should get approved together with JDK-8223396.

Thanks sgehwolf, flagged.

@jerboaa
Copy link
Contributor

jerboaa commented Mar 21, 2022

@dongbohe Please add "Fix Request" comments to bugs you flag for approval. This one should get approved together with JDK-8223396.

Thanks sgehwolf, flagged.

I actually meant a comment on the bugs with 'Fix Request (8u)' that you want approved for backporting (not just the label). Explain why this should get backported and what the risks are. What testing you've done and so on. See: https://openjdk.java.net/projects/jdk-updates/approval.html

@dongbohe
Copy link
Member Author

@dongbohe Please add "Fix Request" comments to bugs you flag for approval. This one should get approved together with JDK-8223396.

Thanks sgehwolf, flagged.

I actually meant a comment on the bugs with 'Fix Request (8u)' that you want approved for backporting (not just the label). Explain why this should get backported and what the risks are. What testing you've done and so on. See: https://openjdk.java.net/projects/jdk-updates/approval.html

Thank you for your patient explanation, I've added a Fix Request (8u) comment on the bugs.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/14 to master March 22, 2022 06:35
@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 8223396
git fetch https://git.openjdk.java.net/jdk8u-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 22, 2022

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

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

8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target

Prebuilding the test class before adding it into a jar file

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

  • 25693fa: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 5fcfb7a: 8194154: System property user.dir should not be changed

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 the ready Pull request is ready to be integrated label Mar 22, 2022
@dongbohe
Copy link
Member Author

Got the push approval.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

@dongbohe
Your change (at version 44051ae) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

  • 25693fa: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 5fcfb7a: 8194154: System property user.dir should not be changed

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 22, 2022
@openjdk openjdk bot closed this Mar 22, 2022
@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 Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

@RealFYang @dongbohe Pushed as commit 2bbec15.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants