Skip to content

Conversation

@zzambers
Copy link
Contributor

@zzambers zzambers commented May 30, 2023

Problem:
Container tests copy tested jdk into container to do testing on it. This however does not work correctly for builds, in which conf directory is symlinked (such as fedora/rhel packages), causing failures due to missing config files in container.

Solution:
Symlinks are followed when copying tested jdk.

Testing:
tier1: OK
containers and jdk/internal/platform: OK


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-8309138: Fix container tests for jdks with symlinked conf dir

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14230

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2023

👋 Welcome back zzambers! 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 added the rfr Pull request is ready for review label May 30, 2023
@openjdk
Copy link

openjdk bot commented May 30, 2023

@zzambers 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 May 30, 2023
@mlbridge
Copy link

mlbridge bot commented May 30, 2023

Webrevs

Copy link
Contributor

@jerboaa jerboaa 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.

@jerboaa
Copy link
Contributor

jerboaa commented May 31, 2023

Seems also trivial.

@openjdk
Copy link

openjdk bot commented May 31, 2023

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

8309138: Fix container tests for jdks with symlinked conf dir

Reviewed-by: sgehwolf

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

  • a990322: 8309111: Removing unused constructor of PerfLongCounter and PerfLongVariable
  • 4f3a95a: 8309054: Parsing of erroneous patterns succeeds
  • 4f16161: 8309044: Replace NULL with nullptr, final sweep of hotspot code
  • 8823626: 8309048: Remove malloc locker test case
  • 927a9ed: 8240774: [REDO] G1DirtyCardQueue destructor has useless flush
  • 119994f: 8308997: RISC-V: Sign extend when comparing 32-bit value with zero instead of testing the sign bit
  • 327733c: 8308986: Disable svc tests failing with virtual thread factory
  • 1e6770f: 8308341: JNI_GetCreatedJavaVMs returns a partially initialized JVM
  • cb40db0: 8309134: Augment test/langtools/tools/javac/versions/Versions.java for JDK 21 language changes
  • de7fd1c: 8307944: ClassFileDumper should only load java.nio.file.Path if enabled
  • ... and 100 more: https://git.openjdk.org/jdk/compare/97d3b2731ebd7594cbc3579f4c375ae70bb489a3...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 (@jerboaa) 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 May 31, 2023
@zzambers
Copy link
Contributor Author

@jerboaa thanks
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 31, 2023
@openjdk
Copy link

openjdk bot commented May 31, 2023

@zzambers
Your change (at version fe634cb) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Jun 1, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 1, 2023

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

  • e827164: 8309146: extend JDI StackFrame.setValue() and JDWP StackFrame.setValues minimal support for virtual threads
  • be36096: 8302822: Method/Field/Constructor/RecordComponent::getGenericInfo() is not thread safe
  • c6f20db: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • d987176: 8307794: Test for HSS/LMS Signature Verification
  • 050425b: 8298127: HSS/LMS Signature Verification
  • a6109bf: 8308856: jdk.internal.classfile.impl.EntryMap::nextPowerOfTwo math problem
  • 6adc242: 8308943: jdk.internal.le build fails on AIX
  • 39f6d80: 8307990: jspawnhelper must close its writing side of a pipe before reading from it
  • 4460429: 8308803: Improve java/util/UUID/UUIDTest.java
  • dfd3da3: 8307683: Loop Predication should not hoist range checks with trap on success projection by negating their condition
  • ... and 132 more: https://git.openjdk.org/jdk/compare/97d3b2731ebd7594cbc3579f4c375ae70bb489a3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 1, 2023

@jerboaa @zzambers Pushed as commit ec55539.

💡 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

Development

Successfully merging this pull request may close these issues.

2 participants