From 1f67ffb029869a432420af3920cc3311126a4036 Mon Sep 17 00:00:00 2001
From: Frederic Thevenet <fthevenet@openjdk.org>
Date: Mon, 6 Nov 2023 08:34:17 +0000
Subject: [PATCH] 8318669: Target OS detection in 'test-prebuilt' makefile
 target is incorrect when running on MSYS2

Backport-of: 202c0137b86cd7bcbe0c1eddf2657f45698ab667
---
 make/RunTestsPrebuilt.gmk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 8cd4ca51bbb..b5e00a70a8f 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -157,6 +157,10 @@ ifeq ($(UNAME_OS), CYGWIN)
   OPENJDK_TARGET_OS := windows
   OPENJDK_TARGET_OS_TYPE := windows
   OPENJDK_TARGET_OS_ENV := windows.cygwin
+else ifeq ($(UNAME_OS), MINGW64)
+  OPENJDK_TARGET_OS := windows
+  OPENJDK_TARGET_OS_TYPE := windows
+  OPENJDK_TARGET_OS_ENV := windows.msys2
 else
   OPENJDK_TARGET_OS_TYPE:=unix
   ifeq ($(UNAME_OS), Linux)
@@ -171,6 +175,9 @@ else
   OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
 endif
 
+# Sanity check env detection
+$(info Detected target OS, type and env: [$(OPENJDK_TARGET_OS)] [$(OPENJDK_TARGET_OS_TYPE)] [$(OPENJDK_TARGET_OS_ENV)])
+
 # Assume little endian unless otherwise specified
 OPENJDK_TARGET_CPU_ENDIAN := little