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

8259451: Zero: skip serviceability/sa tests, set vm.hasSA to false #1999

Closed
wants to merge 1 commit into from

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Jan 8, 2021

Zero does not build SA (see make/autoconf/jdk-options.m4), yet the serviceability/sa tests do not know about this, because vm.hasSA is still "true" for Zero. This makes Serviceability test fail for no good reason. The tests should be skipped for Zero.

Additional testing:

  • Linux x86_64 Zero serviceability/sa tests (now skipped)
  • Linux x86_64 Server serviceability/sa tests (still run)

Progress

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

Issue

  • JDK-8259451: Zero: skip serviceability/sa tests, set vm.hasSA to false

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1999/head:pull/1999
$ git checkout pull/1999

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 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
Copy link

@openjdk openjdk bot commented Jan 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

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jan 8, 2021

/label remove core-libs
/label remove hotspot-runtime
/label add serviceability

Loading

@openjdk openjdk bot removed the core-libs label Jan 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 8, 2021

@shipilev
The core-libs label was successfully removed.

Loading

@openjdk openjdk bot removed the hotspot-runtime label Jan 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 8, 2021

@shipilev
The hotspot-runtime label was successfully removed.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jan 8, 2021

@shipilev
The serviceability label was successfully added.

Loading

@shipilev shipilev marked this pull request as ready for review Jan 8, 2021
@openjdk openjdk bot added the rfr label Jan 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 8, 2021

Webrevs

Loading

jerboaa
jerboaa approved these changes Jan 8, 2021
Copy link
Contributor

@jerboaa jerboaa left a comment

Looks reasonable to me.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jan 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:

8259451: Zero: skip serviceability/sa tests, set vm.hasSA to false

Reviewed-by: sgehwolf, cjplummer

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

Loading

@openjdk openjdk bot added the ready label Jan 8, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jan 11, 2021

/integrate

Loading

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

@openjdk openjdk bot commented Jan 11, 2021

@shipilev Since your change was applied there have been 80 commits pushed to the master branch:

  • bb247b0: 8259392: Zero error reporting is broken after JDK-8255711
  • 2806bf2: 8259475: Fix bad merge in compilerOracle
  • b72de3c: 8259385: Cleanup unused assignment
  • 9154f64: 8254973: CompletableFuture.ThreadPerTaskExecutor does not throw NPE in #execute
  • e7c1740: 8258187: IllegalMonitorStateException in ArrayBlockingQueue
  • 11d5b04: 8258217: PriorityBlockingQueue constructor spec and behavior mismatch
  • 65ca5c6: 8048109: JToggleButton does not fire actionPerformed under certain conditions
  • 81db63e: 8259517: Incorrect test path in test cases
  • 270014a: 8234131: Miscellaneous changes imported from jsr166 CVS 2021-01
  • 63e3bd7: 8246677: LinkedTransferQueue and SynchronousQueue synchronization updates
  • ... and 70 more: https://git.openjdk.java.net/jdk/compare/1b60acd8aa9cbf9aed9deaf16a8eb6c09b44ee55...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3974fd4.

💡 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-8259451-zero-skip-sa branch Jan 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants