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

8294691: dynamicArchive/RelativePath.java is running other test case #10597

Closed
wants to merge 2 commits into from

Conversation

matias9927
Copy link
Contributor

@matias9927 matias9927 commented Oct 6, 2022

Test case in RelativePath.java corrected. Verified with tier 1-4 tests.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8294691: dynamicArchive/RelativePath.java is running other test case

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10597/head:pull/10597
$ git checkout pull/10597

Update a local copy of the PR:
$ git checkout pull/10597
$ git pull https://git.openjdk.org/jdk pull/10597/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10597

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10597.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 6, 2022

👋 Welcome back matias9927! 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
Copy link

openjdk bot commented Oct 6, 2022

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

  • hotspot-runtime

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.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Oct 6, 2022
@matias9927 matias9927 marked this pull request as ready for review October 6, 2022 16:28
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 6, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 6, 2022

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just a small nit.

.assertNormalExit(output-> {
output.shouldContain("Written dynamic archive 0x");
});

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new block also uses a relative path so it should be moved to under the // relative path starting with "." line.

@openjdk
Copy link

openjdk bot commented Oct 6, 2022

@matias9927 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:

8294691: dynamicArchive/RelativePath.java is running other test case

Reviewed-by: iklam, ccheung

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

  • 823b53d: 8294987: Streamline DerOutputStream write
  • 6a266c4: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • fe7a461: 8294920: Missing SP value in Linux x86_32 thread context
  • 4cbac40: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • c1166a3: 8289561: java/lang/instrument/NativeMethodPrefixAgent.java fails with "ERROR: Injection failure: java.lang.UnsupportedOperationException: Records requires ASM8"
  • a1747ef: 8294941: GHA: Cut down cross-compilation sysroots
  • 67210ab: 8286394: Address possibly lossy conversions in jdk.naming.dns
  • 7a194d3: 8290154: [JVMCI] partially implement JVMCI for RISC-V
  • b38bed6: 8294308: Allow dynamically choosing the MEMFLAGS of a type without ResourceObj
  • 118d93b: 8294907: Remove unused NativeLookup::dll_load
  • ... and 104 more: https://git.openjdk.org/jdk/compare/ce85cac947158b4e1f554c55f726c923a49b1a41...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@iklam, @calvinccheung) but any other Committer may sponsor as well.

➡️ 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 Oct 6, 2022
// Create CDS Archive
dump(topArchiveName, "-Xlog:cds",
"-Xlog:cds+dynamic=debug",
"-cp", "." + File.separator + "hello.jar" + File.pathSeparator + appJar2,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For dumping archive, I think it's better not to use relative path as follows:
"-cp", appJar + File.pathSeparator + appJar2,

This test is for validating using relative path during runtime works while relative path wasn't used during dump time.

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one comment below.

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update looks good. Thanks.

@matias9927
Copy link
Contributor Author

/integrate

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

openjdk bot commented Oct 7, 2022

@matias9927
Your change (at version 8d36939) is now ready to be sponsored by a Committer.

@calvinccheung
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 7, 2022

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

  • 823b53d: 8294987: Streamline DerOutputStream write
  • 6a266c4: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • fe7a461: 8294920: Missing SP value in Linux x86_32 thread context
  • 4cbac40: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • c1166a3: 8289561: java/lang/instrument/NativeMethodPrefixAgent.java fails with "ERROR: Injection failure: java.lang.UnsupportedOperationException: Records requires ASM8"
  • a1747ef: 8294941: GHA: Cut down cross-compilation sysroots
  • 67210ab: 8286394: Address possibly lossy conversions in jdk.naming.dns
  • 7a194d3: 8290154: [JVMCI] partially implement JVMCI for RISC-V
  • b38bed6: 8294308: Allow dynamically choosing the MEMFLAGS of a type without ResourceObj
  • 118d93b: 8294907: Remove unused NativeLookup::dll_load
  • ... and 104 more: https://git.openjdk.org/jdk/compare/ce85cac947158b4e1f554c55f726c923a49b1a41...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 7, 2022

@calvinccheung @matias9927 Pushed as commit 3466e99.

💡 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
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants