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

8297853: windows-x86 test build broken #11434

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 30, 2022

test/micro/org/openjdk/bench/java/lang/foreign/libQSortJNI.c is missing the correct macro definition to compile on 32-bit Windows.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11434

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 2022

👋 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 Pull request is ready for review label Nov 30, 2022
@@ -28,7 +28,7 @@
#include "jlong.h"
#include "JNICB.h"

#ifdef _WIN64
#if defined(_WIN64) || defined(_WIN32)
Copy link
Member

Choose a reason for hiding this comment

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

_WIN32 is defined on x64 as well 1, so I think this can just be #ifdef _WIN32 to mean 'Windows'

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Nov 30, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

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

8297853: windows-x86 test build broken

Reviewed-by: jvernee

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

  • c685569: 8297731: Remove redundant check in MutableBigInteger.divide
  • dcf431d: 8287400: Make BitMap range parameter names consistent
  • a1f4db5: 8297584: G1 parallel phase event for scan heap roots is sent too often
  • be4245e: 8294924: JvmtiExport::post_exception_throw() doesn't deal well with concurrent stack processing
  • be99e84: 8296875: Generational ZGC: Refactor loom code

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 30, 2022
@magicus
Copy link
Member Author

magicus commented Nov 30, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

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

  • 53dd214: 8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests
  • 1323e98: 8297170: misc JCK tests fail with "FATAL ERROR in native method: JDWP Can't disable vthread end events, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • c685569: 8297731: Remove redundant check in MutableBigInteger.divide
  • dcf431d: 8287400: Make BitMap range parameter names consistent
  • a1f4db5: 8297584: G1 parallel phase event for scan heap roots is sent too often
  • be4245e: 8294924: JvmtiExport::post_exception_throw() doesn't deal well with concurrent stack processing
  • be99e84: 8296875: Generational ZGC: Refactor loom code

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 30, 2022

@magicus Pushed as commit 6bac332.

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

@magicus magicus deleted the win-x86-build-fix branch November 30, 2022 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants