8299254: Support dealing with standard assert macro

[vieiro]

Backport of JDK-8299254 Support dealing with standard assert macro on top of the previous PR macos-12 github actions .

This will make the github actions in jdk11u-dev run again on top of macos-12 / xcode-13.4.1 .

The change is minimal, and should work properly with no changes on any existing macos-11 CI pipelines.

---

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
• JDK-8299254 needs maintainer approval

Issue

• JDK-8299254: Support dealing with standard assert macro (Enhancement - P4 - Approved)

Reviewers

• Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2937/head:pull/2937
$ git checkout pull/2937

Update a local copy of the PR:
$ git checkout pull/2937
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2937/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2937

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2937.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back vieiro! A progress list of the required criteria for merging this PR into pr/2936 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@vieiro This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8299254: Support dealing with standard assert macro

Reviewed-by: sgehwolf

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 1 new commit pushed to the master branch:

• 59b3859: 8340815: Add SECURITY.md file

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 04: Full - Incremental (ed195ef2)
• 03: Full - Incremental (76d976f7)
• 02: Full (96c74af0)
• 01: Full - Incremental (c7a6fe01)
• 00: Full (5974a924)

[openjdk]

@vieiro Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk-notifier]

The parent pull request that this pull request depends on has been closed without being integrated and the target branch of this pull request has been updated as the previous branch was deleted. This means that changes from the parent pull request will start to show up in this pull request. If closing the parent pull request was done in error, it will need to be re-opened and this pull request will need to manually be retargeted again.

[vieiro]

Rebased on top of #2940

[openjdk]

@vieiro Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout backports/JDK-8299254-macos12
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[jerboaa]

@vieiro Please merge latest master into this PR. Thanks!

[vieiro]

Done! We have green lights in GHA.

[jerboaa]

It would be helpful to explain what the differences of the patch to, say the JDK 17u backport was. As far as I can tell these are:

• Omitted hunk in test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp since the test isn't in JDK 11u
• You didn't remove the gtest/gtest.h related hunk as was done for the 17u version. Why?

What testing have you done? Did you run gtests to verify they still work?

[vieiro]

Thanks for the review!
I tested this with tier1 tests and with gtest. Gtest pass on macos12/x64 too.

[vieiro]

Adding gtest to GHA is easy and does not take too much time to run. Here're results for macos-12, linux and windows

[jerboaa]

Looks OK to me. Thanks!

[openjdk]

⚠️ @vieiro This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[vieiro]

/approval request Avoid clashing with the standard assert macro so that macos builds and tests can proceed in GHA.

[vieiro]

Looks OK to me. Thanks!

Thank you for the review!

[openjdk]

@vieiro
8299254: The approval request has been updated successfully.

[jerboaa]

Lets get this minimal fix in to have appropriate GHA testing on MacOS-X x86_64 for 11u.

/approve yes

[openjdk]

@jerboaa
8299254: The approval request has been approved.

[openjdk]

⚠️ @vieiro the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout backports/JDK-8299254-macos12
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

[vieiro]

/integrate

[openjdk]

@vieiro
Your change (at version ed195ef) is now ready to be sponsored by a Committer.

[jerboaa]

/sponsor

[openjdk]

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

• 0157967: 8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak
• bec83f3: 8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java
• 59b3859: 8340815: Add SECURITY.md file

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa @vieiro Pushed as commit 06d87ca.

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