From 202c0137b86cd7bcbe0c1eddf2657f45698ab667 Mon Sep 17 00:00:00 2001
From: Frederic Thevenet <fthevenet@openjdk.org>
Date: Wed, 25 Oct 2023 12:58:01 +0000
Subject: [PATCH] 8318669: Target OS detection in 'test-prebuilt' makefile
 target is incorrect when running on MSYS2

Reviewed-by: ihse, erikj
---
 make/RunTestsPrebuilt.gmk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index ae14b1e5336..93febe5ed31 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -158,6 +158,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)
@@ -170,6 +174,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