From: Harshit <harshitdhiman1402@gmail.com>
Date: Fri, 13 Feb 2026 10:43:26 +0000 (+0000)
Subject: [PATCH] 8377035: [s390x] Disable JSR166 test cases which uses virtual threads
X-Git-Tag: archive/raspbian/25.0.5_7ea-1+rpi1~3^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a50c71b30a8d4fa60fa18a7988f7fad0d64cef66;p=openjdk-25.git

[PATCH] 8377035: [s390x] Disable JSR166 test cases which uses virtual threads

Reviewed-by: jpai, alanb, amitkumar
Bug: https://bugs.openjdk.org/browse/JDK-8377035
Origin: upstream, https://github.com/openjdk/jdk/commit/4e7106d8919652c1dcd4a501a11057e1a8179b3e


Gbp-Pq: Name jdk-8377035.diff
---

diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index 18007f72c..a6138f0e8 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -37,7 +37,9 @@
 /*
  * @test id=default
  * @summary Conformance testing variant of JSR-166 tck tests.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000 JSR166TestCase
  */
@@ -46,7 +48,9 @@
  * @test id=forkjoinpool-common-parallelism
  * @summary Test implementation details variant of JSR-166
  *          tck tests with ForkJoinPool common parallelism.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -68,7 +72,9 @@
  * @summary Remaining test implementation details variant of
  *          JSR-166 tck tests apart from ForkJoinPool common
  *          parallelism.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -135,6 +141,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
+import jdk.test.lib.Platform;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
@@ -624,6 +631,13 @@ public class JSR166TestCase extends TestCase {
                 "SynchronousQueue20Test",
                 "ReentrantReadWriteLock20Test"
             };
+
+            if (Platform.isS390x()) {
+                java20TestClassNames = new String[] {
+                    "ForkJoinPool20Test",
+                };
+            }
+
             addNamedTestClasses(suite, java20TestClassNames);
         }