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

8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values #2031

Closed
wants to merge 2 commits into from

Conversation

RealLucy
Copy link
Contributor

@RealLucy RealLucy commented Jul 5, 2023

I backport this for parity with 11.0.21-oracle.
Whitebox obviously differs in location between 11 and head. Needed adaptations.
In all affected files, some chunks did not apply. Manual resolution was straightforward.

GHA and SAP-internal tests succeeded.


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-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2031/head:pull/2031
$ git checkout pull/2031

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2031

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2031.diff

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 5, 2023

👋 Welcome back lucy! 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 3c61d5aa48606dab2d2c639d5f0a56313476917d 8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values Jul 5, 2023
@openjdk
Copy link

openjdk bot commented Jul 5, 2023

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 Jul 5, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 5, 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.

The import mistake makes the test not compile. Looks good otherwise.

*/
import jdk.test.lib.containers.docker.Common;
import jdk.test.lib.containers.docker.DockerRunOptions;
import jdk.test.lib.containers.docker.DockerTestUtils;
import jdk.test.lib.sun.hotspot.WhiteBox;
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be:

import sun.hotspot.WhiteBox;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for approving this PR, @jerboaa
And thank you for pointing me to the error. I was in a hurry to make the SAP nightmare deadline.
Learning? If you can't make it with diligence, don't do it. As always.
import stmt is fixed.

@openjdk
Copy link

openjdk bot commented Jul 5, 2023

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

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

8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values

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

  • b9a29eb: 8297437: javadoc cannot link to old docs (with old style anchors)
  • dbf8820: 8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
  • 750387b: 8297887: Update Siphash
  • 2854320: 8306638: Open source some AWT tests related to datatransfer and Toolkit
  • 9fecfb3: 8305950: Have -XshowSettings option display tzdata version
  • 6b84480: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • 532fbe9: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton
  • ... and 9 more: https://git.openjdk.org/jdk11u-dev/compare/9c97b37e1bca898a3ba2832342c909879cb4e31c...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 5, 2023
@RealLucy
Copy link
Contributor Author

RealLucy commented Jul 6, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 6, 2023

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

  • b9a29eb: 8297437: javadoc cannot link to old docs (with old style anchors)
  • dbf8820: 8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
  • 750387b: 8297887: Update Siphash
  • 2854320: 8306638: Open source some AWT tests related to datatransfer and Toolkit
  • 9fecfb3: 8305950: Have -XshowSettings option display tzdata version
  • 6b84480: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • 532fbe9: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6b77069: 8291830: jvmti/RedefineClasses/StressRedefine failed: assert(!is_null(v)) failed: narrow klass value can never be zero
  • b3417d8: 8293657: sun/management/jmxremote/bootstrap/RmiBootstrapTest.java#id1 failed with "SSLHandshakeException: Remote host terminated the handshake"
  • a975a1e: 8286620: Create regression test for verifying setMargin() of JRadioButton
  • ... and 9 more: https://git.openjdk.org/jdk11u-dev/compare/9c97b37e1bca898a3ba2832342c909879cb4e31c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 6, 2023

@RealLucy Pushed as commit 1a99b6e.

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

Successfully merging this pull request may close these issues.

None yet

2 participants