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/jdk11u-dev.git pull/2229/head:pull/2229
$ git checkout pull/2229

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2229

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2229.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 (3661f0a5)

[openjdk]

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

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

• de9ae1e: 8293811: Provide a reason for PassFailJFrame.forceFail
• 32e63eb: 8312065: Socket.connect does not timeout when profiling
• 2fbb4b9: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
• 910e2c4: 8308910: Allow executeAndLog to accept running process
• 46ce8cb: 8306765: Some client related jtreg problem list entries are malformed
• 9f74d26: 8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events
• 53acd95: 8251177: [macosx] The text "big" is truncated in JTabbedPane
• dd1994e: 8231931: [TESTBUG] serviceability/sa/TestUniverse.java looks for wrong string with Shenandoah
• cf13e82: 8313691: use close after failing os::fdopen in vmError and ciEnv
• b9936cd: 8221396: Clean up serviceability/sa/TestUniverse.java
• ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/35000fb1c290e971663969471ddc536e766c0d5e...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.

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 3661f0a) is now ready to be sponsored by a Committer.

[GoeLin]

/sponsor

[openjdk]

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

• f6bdbe8: 8317967: Enhance test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java to handle default cases
• feb051f: 8316906: Clarify TLABWasteTargetPercent flag
• 9abfdde: 8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
• 18d616d: 8306280: Open source several choice AWT tests
• f993ef5: 8284331: Add sanity check for signal handler modification warning.
• 92c5062: 8289238: Refactoring changes to PassFailJFrame Test Framework
• d90b9ac: 8285612: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java
• 3377127: 8183374: Refactor java/lang/Runtime shell tests to java
• c73323b: 8240604: Rewrite sun/management/jmxremote/bootstrap/CustomLauncherTest.java test to make binaries from source file
• 569ecf4: 8226825: Replace wildcard address with loopback or local host in tests - part 19
• ... and 14 more: https://git.openjdk.org/jdk11u-dev/compare/35000fb1c290e971663969471ddc536e766c0d5e...master

Your commit was automatically rebased without conflicts.

[openjdk]

@GoeLin @fthevenet Pushed as commit 1f67ffb.

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