8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2

[fthevenet]

Backport of 8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2

This is low risk as this only affects testing on Windows with MSYS2, when run using the "run-prebuilt" makefile target.
Without this patch, however, Windows-specific patches may fail or otherwise misbehave when run under such conditions (which is notably the case in Github actions).

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• JDK-8318669 needs maintainer approval

Issue

• JDK-8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2 (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1929

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back fthevenet! 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]

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

[openjdk]

⚠️ @fthevenet 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.

[mlbridge]

Webrevs

• 00: Full (ffab07d8)

[fthevenet]

/approval

[openjdk]

@fthevenet usage: /approval [<id>] (request|cancel) [<text>]

[openjdk]

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

8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2

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

• 348a703: 8318953: RISC-V: Small refactoring for MacroAssembler::test_bit
• 594e5d7: 8312467: relax the builddir check in make/autoconf/basic.m4
• 8922e52: 8312612: handle WideCharToMultiByte return values
• 57bf412: 8308593: Add KEEPALIVE Extended Socket Options Support for Windows
• 4a638cb: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
• d61229d: 8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
• 03e3232: 6445283: ProgressMonitorInputStream not large file aware (>2GB)

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.

➡️ 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).

[fthevenet]

/integrate

[openjdk]

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

[shipilev]

/sponsor

[openjdk]

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

• 348a703: 8318953: RISC-V: Small refactoring for MacroAssembler::test_bit
• 594e5d7: 8312467: relax the builddir check in make/autoconf/basic.m4
• 8922e52: 8312612: handle WideCharToMultiByte return values
• 57bf412: 8308593: Add KEEPALIVE Extended Socket Options Support for Windows
• 4a638cb: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
• d61229d: 8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
• 03e3232: 6445283: ProgressMonitorInputStream not large file aware (>2GB)

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev @fthevenet Pushed as commit a273858.

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