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

8210112: remove jdk.testlibrary.ProcessTools #945

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 25, 2022

I want to backport this ot simplify follow-up test backports.

I had to adapt the change in several means. This is a list
of the changes to resolve failed hunks:

Already fixed:
patching file test/jdk/com/sun/jdi/ExclusiveBind.java

Resolved, 8211171 move JarUtils to top-level testlibrary already backported.
patching file test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Driver.java
patching file test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java
patching file test/jdk/java/lang/instrument/executableJAR/ExecJarWithAgent.java
patching file test/jdk/java/rmi/module/ModuleTest.java

Context
patching file test/jdk/java/lang/System/OsVersionTest.java
patching file test/jdk/java/security/Policy/SignedJar/SignedJarTest.java
patching file test/jdk/java/util/Arrays/TimSortStackSize2.java

Copyright
patching file test/jdk/javax/management/remote/mandatory/connection/DefaultAgentFilterTest.java

Resolved, 8211171 move JarUtils to top-level testlibrary already backported.
patching file test/jdk/jdk/modules/scenarios/automaticmodules/RunWithAutomaticModules.java
patching file test/jdk/sun/security/tools/jarsigner/TsacertOptionTest.java

Copyright
patching file test/jdk/sun/security/tools/jarsigner/Warning.java
patching file test/jdk/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java

Resolved, 8211171 move JarUtils to top-level testlibrary already backported.
patching file test/jdk/sun/security/tools/jarsigner/warnings/NoTimestampTest.java

File not in 11: --- probably goes away
test/jdk/sun/tools/jcmd/JcmdBase.java b/test/jdk/sun/tools/jcmd/JcmdBase.java
patching file test/jdk/sun/tools/jcmd/TestJcmdDefaults.java
patching file test/jdk/sun/tools/jcmd/TestJcmdSanity.java

Copyright
patching file test/jdk/sun/tools/jmap/BasicJMapTest.java

Resolved
patching file test/jdk/sun/tools/jstatd/JstatdTest.java

Resolved, 8211171 move JarUtils to top-level testlibrary already backported.
patching file test/jdk/tools/jlink/basic/BasicTest.java
patching file test/jdk/tools/launcher/modules/addexports/manifest/AddExportsAndOpensInManifest.java
patching file test/jdk/tools/launcher/modules/addreads/AddReadsTest.java
patching file test/jdk/tools/launcher/modules/illegalaccess/IllegalAccessTest.java
patching file test/jdk/tools/launcher/modules/patch/basic/PatchTest.java
patching file test/jdk/tools/launcher/modules/patch/basic/PatchTestWarningError.java
patching file test/jdk/tools/launcher/modules/validate/ValidateModulesTest.java

On top of this, I had to adapt a few tests to work after removal of
the old testlibrary file.

Last, I had to move the change of "8217375: jarsigner breaks old signature with long lines in manifest"
to OutputAnalyzer.java from the old file to the new one.

Now all test are passing.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 945

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 25, 2022

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

@openjdk openjdk bot changed the title Backport 21a0458422c462f5ae82a98ce08c6460db26c67e 8210112: remove jdk.testlibrary.ProcessTools Mar 25, 2022
@openjdk
Copy link

openjdk bot commented Mar 25, 2022

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 Mar 25, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 25, 2022

Webrevs

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Mar 25, 2022

Thanks for the detailed description. However, it's still not easy to review. Can you be more specific regarding "I had to adapt a few tests to work after removal of the old testlibrary file.", please?
(It sometimes helps reviewers to use individual commits when several steps were done. Just as an idea for future backports.)

@GoeLin
Copy link
Member Author

GoeLin commented Mar 27, 2022

Hi,

thanks for looking at this cumbersome change :).

It have basically been these files I had to edit on top of the original change:
test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
test/jdk/sun/security/tools/jarsigner/compatibility/SignTwice.java
test/jdk/sun/security/tools/jarsigner/warnings/LowerCaseManifest.java

Also, I had to edit one of the OutputAnalyzer constructors.
It was only added in a later change in head, but already
backported to 11. It needs to call OutputBuffer.

The differences in the Jcmd tests I mentioned above went away
because I backported a prerequisite change.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 28, 2022

Pre-submit failure

  • missing dependencie
  • assertion in CMS
    Both unrealted to this test-only change. But the assertion is something to look at. It is already reported as JDK-8272195.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Thanks! Looks reasonable.

@openjdk
Copy link

openjdk bot commented Mar 28, 2022

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

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

8210112: remove jdk.testlibrary.ProcessTools

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 25 new commits pushed to 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.

➡️ 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 28, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

  • 6518636: 8273176: handle latest VS2019 in abstract_vm_version
  • 358fc5a: 8276657: XSLT compiler tries to define a class with empty name
  • 2049fca: 8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
  • 2bb6a3b: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 27b388c: 8252957: Wrong comment in CgroupV1Subsystem::cpu_quota
  • 29b0b63: 8254997: Remove unimplemented OSContainer::read_memory_limit_in_bytes
  • d5ae8cf: 8239785: Cgroups: Incorrect detection logic on old systems in hotspot
  • 146fe86: 8256722: handle VC++:1927 VS2019 in abstract_vm_version
  • 588bdfa: 8274751: Drag And Drop hangs on Windows
  • e6020c3: 6986863: ProfileDeferralMgr throwing ConcurrentModificationException
  • ... and 18 more: https://git.openjdk.java.net/jdk11u-dev/compare/79c45a5963edd40eab42e40c456a4f28cba65501...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 29, 2022

@GoeLin Pushed as commit 9aa728e.

💡 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_8210112 branch Mar 29, 2022
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
2 participants