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

fthevenet · 2023-10-24T10:29:32Z

This PR addresses OS detection not working properly when running test-prebuilt on MSYS2, which causes some Windows specific tests to misbehave or fail in Github Actions.

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

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

Reviewers

Magnus Ihse Bursie (@magicus - Reviewer)
Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16343

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

Using diff file

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

Webrev

Link to Webrev Comment

…correct when running on MSYS2

bridgekeeper · 2023-10-24T10:30:30Z

👋 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 · 2023-10-24T10:31:13Z

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

build

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.

mlbridge · 2023-10-24T18:24:55Z

Webrevs

01: Full - Incremental (43aa74bb)
00: Full (7a79d5f0)

erikj79 · 2023-10-24T21:18:44Z

make/RunTestsPrebuilt.gmk

-    OPENJDK_TARGET_OS := linux
-  else ifeq ($(UNAME_OS), Darwin)
-    OPENJDK_TARGET_OS := macosx
+  ifeq ($(UNAME_OS), MINGW64)


Instead of nesting, this inside the else body, creating more nesting below, make supports

else ifeq ...

By using that you can keep the else body with unix on the same indentation level.

magicus

This looks good. Thanks for fixing it!

openjdk · 2023-10-25T12:06:11Z

@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

Reviewed-by: ihse, erikj

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

c587211: 8316003: Update FileChooserSymLinkTest.java to HTML instructions
42b9ac8: 8294156: Allow PassFailJFrame.Builder to create test UI
14090ef: 8294158: HTML formatting for PassFailJFrame instructions
d2d1592: 8318713: G1: Use more accurate age in predict_eden_copy_time_ms
c3cdfe2: 8318692: Add instructions for creating Ubuntu-based sysroot for cross compilation
ba7d08b: 8316961: Fallback implementations for 64-bit Atomic::{add,xchg} on 32-bit platforms
d7205e6: 8318102: macos10.14 check in CSystemColors can be removed.
5ce718e: 8318100: Remove redundant check for Metal support
f1dfdc1: 8311877: [macos] Add CLI options to provide signing identity directly to codesign and productbuild
9c819fd: 8318051: Duration.between uses exceptions for control flow
... and 17 more: https://git.openjdk.org/jdk/compare/4a16d111b16e556f904fb80075631b8439a9482e...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. Possible candidates are the reviewers of this PR (@magicus, @erikj79) 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).

fthevenet · 2023-10-25T12:47:31Z

NB: The test failure in linux-x86 / test (langtools/tier1) is caused by a JVM crash:

# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (g1ConcurrentMark.cpp:1680), pid=23337, tid=23347
#  fatal error: Overflow during reference processing, can not continue. Current mark stack depth: 65472, MarkStackSize: 65536, MarkStackSizeMax: 4194304. Please increase MarkStackSize and/or MarkStackSizeMax and restart.

I believe it is unrelated, as the logs show the correct environment was inferred for this test:

Detected target OS, type and env: [linux] [unix] [linux]

magicus · 2023-10-25T12:52:12Z

Yes, it is definitely unrelated. It is in 32-bit code, which is not nearly as well tested. Just ignore it.

fthevenet · 2023-10-25T12:54:42Z

/integrate

openjdk · 2023-10-25T12:56:12Z

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

magicus · 2023-10-25T12:57:08Z

/sponsor

openjdk · 2023-10-25T12:58:04Z

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

c587211: 8316003: Update FileChooserSymLinkTest.java to HTML instructions
42b9ac8: 8294156: Allow PassFailJFrame.Builder to create test UI
14090ef: 8294158: HTML formatting for PassFailJFrame instructions
d2d1592: 8318713: G1: Use more accurate age in predict_eden_copy_time_ms
c3cdfe2: 8318692: Add instructions for creating Ubuntu-based sysroot for cross compilation
ba7d08b: 8316961: Fallback implementations for 64-bit Atomic::{add,xchg} on 32-bit platforms
d7205e6: 8318102: macos10.14 check in CSystemColors can be removed.
5ce718e: 8318100: Remove redundant check for Metal support
f1dfdc1: 8311877: [macos] Add CLI options to provide signing identity directly to codesign and productbuild
9c819fd: 8318051: Duration.between uses exceptions for control flow
... and 17 more: https://git.openjdk.org/jdk/compare/4a16d111b16e556f904fb80075631b8439a9482e...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-10-25T12:58:11Z

@magicus @fthevenet Pushed as commit 202c013.

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

8318669: Target OS detection in 'test-prebuilt' makefile target is in…

7a79d5f

…correct when running on MSYS2

openjdk bot added the build build-dev@openjdk.org label Oct 24, 2023

fthevenet mentioned this pull request Oct 24, 2023

8317510: Change Windows debug symbol files naming to avoid losing info when an executable and a library share the same name #16039

Closed

3 tasks

fthevenet marked this pull request as ready for review October 24, 2023 18:18

openjdk bot added the rfr Pull request is ready for review label Oct 24, 2023

erikj79 reviewed Oct 24, 2023

View reviewed changes

Use 'else ifeq' statement

43aa74b

magicus approved these changes Oct 25, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 25, 2023

erikj79 approved these changes Oct 25, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 25, 2023

openjdk bot added the integrated Pull request has been integrated label Oct 25, 2023

openjdk bot closed this Oct 25, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 25, 2023

fthevenet deleted the 8318669 branch October 25, 2023 13:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

fthevenet commented Oct 24, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 24, 2023

openjdk bot commented Oct 24, 2023

mlbridge bot commented Oct 24, 2023 •

edited

Loading

erikj79 Oct 24, 2023

fthevenet Oct 25, 2023

magicus left a comment

openjdk bot commented Oct 25, 2023 •

edited

Loading

fthevenet commented Oct 25, 2023

magicus commented Oct 25, 2023

fthevenet commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

magicus commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

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

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

Conversation

fthevenet commented Oct 24, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Oct 24, 2023

openjdk bot commented Oct 24, 2023

mlbridge bot commented Oct 24, 2023 • edited Loading

Webrevs

erikj79 Oct 24, 2023

Choose a reason for hiding this comment

fthevenet Oct 25, 2023

Choose a reason for hiding this comment

magicus left a comment

Choose a reason for hiding this comment

openjdk bot commented Oct 25, 2023 • edited Loading

fthevenet commented Oct 25, 2023

magicus commented Oct 25, 2023

fthevenet commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

magicus commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

openjdk bot commented Oct 25, 2023

fthevenet commented Oct 24, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Oct 24, 2023 •

edited

Loading

openjdk bot commented Oct 25, 2023 •

edited

Loading