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

8251400: Fix incorrect addition of library to test in JDK-8237858 #6682

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Dec 2, 2021

In JDK-8237858, -pthread was added to all native tests, instead of the one single test that needed it. In the meantime, two new tests with pthread dependencies has crept in unnoticed due to this.


Progress

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

Issue

  • JDK-8251400: Fix incorrect addition of library to test in JDK-8237858

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6682

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 2, 2021

👋 Welcome back ihse! 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 label Dec 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 2021

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

  • build

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 build label Dec 2, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 2, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Looks good.

I don't think -pthread would actually hurt anything though.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Dec 3, 2021

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

8251400: Fix incorrect addition of library to test in JDK-8237858

Reviewed-by: dholmes, erikj

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

  • f723779: 8278079: C2: expand_dtrace_alloc_probe doesn't take effect in macro.cpp
  • 3f28a21: 8278144: Javadoc for MemorySegment::set/MemorySegment::setAtIndex is missing throws tag
  • ba2a8e5: 8278205: jlink plugins should dump .class file in debug mode
  • 18c54b4: 8274640: Cleanup unnecessary null comparison before instanceof check in java.desktop
  • dda8f26: 8278139: G1: Refactor G1BlockOffsetTablePart::block_at_or_preceding
  • e4774e6: 8277916: Gather non-strong reference count logic in a single place
  • 53df9ff: 8278154: SimpleFileServer#createFileServer() should specify that the returned server is not started
  • d1cad24: 8278168: Add a few missing words to the specification of Files.mismatch
  • 45da3ae: 8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup
  • 8907003: 8272234: Pass originating elements from Filer to JavaFileManager
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/c93552c8bbcdabb6219327d67409bf63432f49d8...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 label Dec 3, 2021
erikj79
erikj79 approved these changes Dec 3, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Dec 3, 2021

/integrate

@magicus
Copy link
Member Author

@magicus magicus commented Dec 3, 2021

@dholmes-ora I agree that it's mostly benign in this case, but where do you draw the line? For every library you can argue "this does not really hurt to include on all tests" and suddenly you have a very complex testing environment if all tests have all libraries all the time...

@openjdk
Copy link

@openjdk openjdk bot commented Dec 3, 2021

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

  • 0a09092: 8268288: jdk/jfr/api/consumer/streaming/TestOutOfProcessMigration.java fails with "Error: ShouldNotReachHere()"
  • 0d938ce: 8278172: java/nio/channels/FileChannel/BlockDeviceSize.java should only run on Linux
  • 0e7b6bc: 8278141: LIR_OpLoadKlass::_info shadows the field of the same name from LIR_Op
  • 53a4342: 8278137: JFR: PrettyWriter uses incorrect year specifier
  • f723779: 8278079: C2: expand_dtrace_alloc_probe doesn't take effect in macro.cpp
  • 3f28a21: 8278144: Javadoc for MemorySegment::set/MemorySegment::setAtIndex is missing throws tag
  • ba2a8e5: 8278205: jlink plugins should dump .class file in debug mode
  • 18c54b4: 8274640: Cleanup unnecessary null comparison before instanceof check in java.desktop
  • dda8f26: 8278139: G1: Refactor G1BlockOffsetTablePart::block_at_or_preceding
  • e4774e6: 8277916: Gather non-strong reference count logic in a single place
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/c93552c8bbcdabb6219327d67409bf63432f49d8...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Dec 3, 2021

@magicus Pushed as commit fbf096e.

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

@magicus magicus deleted the fix-pthread-for-all-libs branch Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build integrated
3 participants