From a9fa4999459ee44bc9318db903f99a71bc6c3943 Mon Sep 17 00:00:00 2001
From: Ashay Rane <arane@openjdk.org>
Date: Thu, 25 Jun 2026 15:47:12 +0000
Subject: [PATCH] 8387044: test/jdk/javax/script/CommonSetup.sh incorrectly
 sets isCygwin=true for MSys/MinGW

Reviewed-by: jpai, syan
---
 .../lang/instrument/appendToClassLoaderSearch/CommonSetup.sh  | 4 ++--
 test/jdk/javax/script/CommonSetup.sh                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
index f2412a92a43..af2f3f8b3f1 100644
--- a/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
+++ b/test/jdk/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ case "$OS" in
     OS="Windows"
     FS="\\"
     ;;
-  CYGWIN* | MSYS* | MINGW*)
+  CYGWIN*)
     PS=";"
     OS="Windows"
     FS="\\"
diff --git a/test/jdk/javax/script/CommonSetup.sh b/test/jdk/javax/script/CommonSetup.sh
index 4b59f9cbbc7..363d679df54 100644
--- a/test/jdk/javax/script/CommonSetup.sh
+++ b/test/jdk/javax/script/CommonSetup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ case "$OS" in
     OS="Windows"
     FS="\\"
     ;;
-  CYGWIN* | MSYS* | MINGW* )
+  CYGWIN* )
     PS=";"
     OS="Windows"
     FS="\\"