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

8265227: Move Proc.java from security/testlibrary to test/lib #3496

Closed
wants to merge 3 commits into from

Conversation

@wangweij
Copy link
Contributor

@wangweij wangweij commented Apr 14, 2021

I'd like to move this tool to test/lib inside a proper named package.


Progress

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

Issue

  • JDK-8265227: Move Proc.java from security/testlibrary to test/lib

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3496/head:pull/3496
$ git checkout pull/3496

Update a local copy of the PR:
$ git checkout pull/3496
$ git pull https://git.openjdk.java.net/jdk pull/3496/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3496

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3496.diff

8265227: Move Proc.java from security/testlibrary to test/lib
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 14, 2021

👋 Welcome back weijun! 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 added the rfr label Apr 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

@wangweij The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

Loading

@openjdk openjdk bot added the security label Apr 14, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 14, 2021

Webrevs

Loading

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Good idea. Is there a more evocative class name than Proc?

It looks similar to jdk.test.lib.process.ProcessTools.

Would it fit in the jdk.test.lib.process package? It would make it easier for non-security testers to find and use? ( I like the fluid construction)

Loading

@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 14, 2021

Well, we can certainly rename it. It's only used by several tests. Maybe ChildProcess?

And we can certainly move it to a different package. I know it has some duplicate functions with other tools so it will be better to do some cleanup first. The best function of this class is it provides several methods (both for child and parent) to simplify inter-process message transport.

Loading

@RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Apr 14, 2021

I think is fine to move it first and refactor it separately; that's a bigger job.
If its fit for the purpose, the overlap is fine between tools.

Loading

Copy link
Member

@XueleiFan XueleiFan left a comment

Looks good to me.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8265227: Move Proc.java from security/testlibrary to test/lib

Reviewed-by: rriggs, xuelei, rhalade, ssahoo

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

  • 4e90d74: 8048199: Replace anonymous inner classes with lambdas, where applicable, in JNDI
  • 6293299: 8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly
  • 6b90715: 8265278: doc build fails after JDK-8262981
  • 0fee6ec: 8264318: Lanai: DrawHugeImageTest.java fails on apple M1
  • 81877f7: 8262501: jdk17 libjvm link failure with --as-needed and clock_gettime in librt
  • b23dbdb: 8257804: Test runtime/modules/ModuleStress/ModuleStressGC.java fails: 'package test defined in module jdk.test, exports list being walked' missing from stdout/stderr
  • 9d669c9: 8262981: Create implementation for NSAccessibilitySlider protocol
  • abdff79: 8163086: java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java fails
  • b72d99e: 8233564: [TESTBUG] MouseComboBoxTest.java is failing
  • 2b5869a: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • ... and 155 more: https://git.openjdk.java.net/jdk/compare/9c283da1752db3b8c89cc21016277e43eadd6cf4...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 Apr 14, 2021
@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 14, 2021

New commit that uses a different method to find out -add-exports and --add-opens so there is no need to for @modules java.base/jdk.internal.misc anymore. Otherwise, there are other tests that have @build jdk.test.lib.process.* would fail without the extra @modules tag.

Note: the modules line in test/jdk/sun/security/krb5/auto/TEST.properties is not removed but there are tests calling jdk.internal.misc.VM.geteuid().

Loading

@wangweij
Copy link
Contributor Author

@wangweij wangweij commented Apr 15, 2021

/integrate

Loading

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

@openjdk openjdk bot commented Apr 15, 2021

@wangweij Since your change was applied there have been 166 commits pushed to the master branch:

  • 7b61a42: 8265173: [test] divert spurious log output away from stream under test in ProcessBuilder Basic test
  • 4e90d74: 8048199: Replace anonymous inner classes with lambdas, where applicable, in JNDI
  • 6293299: 8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly
  • 6b90715: 8265278: doc build fails after JDK-8262981
  • 0fee6ec: 8264318: Lanai: DrawHugeImageTest.java fails on apple M1
  • 81877f7: 8262501: jdk17 libjvm link failure with --as-needed and clock_gettime in librt
  • b23dbdb: 8257804: Test runtime/modules/ModuleStress/ModuleStressGC.java fails: 'package test defined in module jdk.test, exports list being walked' missing from stdout/stderr
  • 9d669c9: 8262981: Create implementation for NSAccessibilitySlider protocol
  • abdff79: 8163086: java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java fails
  • b72d99e: 8233564: [TESTBUG] MouseComboBoxTest.java is failing
  • ... and 156 more: https://git.openjdk.java.net/jdk/compare/9c283da1752db3b8c89cc21016277e43eadd6cf4...master

Your commit was automatically rebased without conflicts.

Pushed as commit c70589c.

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

Loading

@wangweij wangweij deleted the 8265227 branch Apr 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants