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

8273487: Zero: Handle "zero" variant in runtime tests #5413

Closed

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Sep 8, 2021

JDK-8179317 rewritten runtime shell tests to Java. There is a little omission in VM variant selection, which makes Zero fail some of the tier1 tests, like:

$ CONF=linux-x86_64-zero-fastdebug make exploded-test TEST=runtime/StackGap/TestStackGap.java

STDERR:
java.lang.Error: TESTBUG: unsupported vm variant
at jdk.test.lib.Platform.variant(Platform.java:368)
at jdk.test.lib.Platform.jvmLibDir(Platform.java:357)
at jdk.test.lib.process.ProcessTools.addJvmLib(ProcessTools.java:585)
at jdk.test.lib.process.ProcessTools.createNativeTestProcessBuilder(ProcessTools.java:575) 

Additional testing:

  • Linux x86_64 Zero affected tests (StackGap, StackGuardPages, TestTLS) now run

Progress

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

Issue

  • JDK-8273487: Zero: Handle "zero" variant in runtime tests

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5413

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 8, 2021

👋 Welcome back shade! 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 Sep 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

@shipilev The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-runtime

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 8, 2021

Webrevs

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 8, 2021

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

8273487: Zero: Handle "zero" variant in runtime tests

Reviewed-by: alanb, dholmes

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

  • 7fd6b0b: 8273242: (test) Refactor to use TestNG for RuntimeTests ExecCommand tests
  • a5e4def: 8265489: Stress test times out because of long ObjectSynchronizer::monitors_iterate(...) operation
  • 9b5991e: 8273451: Remove unreachable return in mutexLocker::wait
  • e680503: 8273185: Rename the term "atomic" in ReferenceProcessor
  • ba31eee: 8273109: runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest times out
  • 4d5e1ed: 8272375: Improve phrasing of synthesized descriptions in JavaFX docs
  • 267c61a: 8273361: InfoOptsTest is failing in tier1
  • f7e9f56: 8273359: CI: ciInstanceKlass::get_canonical_holder() doesn't respect instance size
  • d7efd0e: 8273450: Fix the copyright header of SVML files
  • e5f298a: 8273329: Remove redundant null check from String.getBytes(String charsetName)
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/3cd95a2932ab6a2cb39322354f7ad181de8bfc9e...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 Sep 8, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 8, 2021

Huh, it turns out there is the awkwardness in the build system that puts product libjvm.so to server for Zero. See JDK-8273494. This was not the cause for gtest libjvm.so, which is in zero folder for Zero. So I had to make it more awkward until the build system fix is here. See new commit.

Loading

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 9, 2021

I am integrating this to get the more complete tier1 runs for Zero, and then I would tackle JDK-8273494.

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 9, 2021

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

  • dc33bd8: 8273315: Parallelize and increase timeouts for java/foreign/TestMatrix.java test
  • 5b1dfe4: 8273439: Fix G1CollectedHeap includes and forward declarations
  • 6eba443: 8273387: remove some unreferenced gtk-related functions
  • 5df2648: 8273218: G1: Rename g1EvacuationInfo to g1EvacInfo
  • 12f0b77: 8273516: ProblemList compiler/c2/Test7179138_1.java in -Xcomp mode on win-X64
  • 7fd6b0b: 8273242: (test) Refactor to use TestNG for RuntimeTests ExecCommand tests
  • a5e4def: 8265489: Stress test times out because of long ObjectSynchronizer::monitors_iterate(...) operation
  • 9b5991e: 8273451: Remove unreachable return in mutexLocker::wait
  • e680503: 8273185: Rename the term "atomic" in ReferenceProcessor
  • ba31eee: 8273109: runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest times out
  • ... and 31 more: https://git.openjdk.java.net/jdk/compare/3cd95a2932ab6a2cb39322354f7ad181de8bfc9e...master

Your commit was automatically rebased without conflicts.

Loading

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

@openjdk openjdk bot commented Sep 9, 2021

@shipilev Pushed as commit 8c16f48.

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

Loading

@shipilev shipilev deleted the JDK-8273487-zero-handle-variant branch Sep 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants