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

8264408: test_oopStorage no longer needs to disable some tests on WIN32 #4026

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented May 14, 2021

The gtest gc/shared/test_oopStorage.cpp disables some tests on 32bit Windows because they use SafeFetch, which couldn't be used in the context where these tests were run. JDK-8185734 tracked the problem of using SafeFetch in gtests, and has since been fixed. So the OopStorage tests no longer need to be disabled.

Removing the test suppression involves removing the macro DISABLE_GARBAGE_ALLOCATION_STATUS_TEST and the #ifndef uses of it from test_oopStorage.cpp.

Note that the condition for defining that macro was botched, so that it applied to all Windows platforms, not just 32bit Windows. So the relevant tests haven't been executed on any version of Windows.


Progress

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

Issue

  • JDK-8264408: test_oopStorage no longer needs to disable some tests on WIN32

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4026

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 14, 2021

👋 Welcome back stuefe! 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
Copy link

openjdk bot commented May 14, 2021

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

  • hotspot-gc

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 hotspot-gc hotspot-gc-dev@openjdk.org label May 14, 2021
@tstuefe tstuefe changed the title JDK-8264408: test_oopStorage no longer needs to disable some tests on WIN32 8264408: test_oopStorage no longer needs to disable some tests on WIN32 May 18, 2021
@tstuefe tstuefe marked this pull request as ready for review May 18, 2021 06:42
@openjdk openjdk bot added the rfr Pull request is ready for review label May 18, 2021
@mlbridge
Copy link

mlbridge bot commented May 18, 2021

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Oh wow, Microsoft docs on predefined macros: "_WIN32 Defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64. Otherwise, undefined."

@openjdk
Copy link

openjdk bot commented May 18, 2021

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

8264408: test_oopStorage no longer needs to disable some tests on WIN32

Reviewed-by: shade, tschatzl

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 18, 2021
@tstuefe
Copy link
Member Author

tstuefe commented May 18, 2021

Looks good to me.

Thanks!

Oh wow, Microsoft docs on predefined macros: "_WIN32 Defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64. Otherwise, undefined."

Has been always this way. I believe it was used in the nineties to distinguish between 32bit and 16bit, now its just Windows.

..THomas

Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.

@tstuefe
Copy link
Member Author

tstuefe commented May 18, 2021

Thanks @shipilev and @tschatzl .

/integrate

@openjdk openjdk bot closed this May 18, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 18, 2021
@openjdk
Copy link

openjdk bot commented May 18, 2021

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

Your commit was automatically rebased without conflicts.

Pushed as commit da7c846.

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

@tstuefe tstuefe deleted the JDK-8264408-test_oopStorage-no-longer-needs-to-disable-SEH branch August 23, 2021 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants