Skip to content

Commit 4e7106d

Browse files
Harshit470250jaikiran
authored andcommitted
8377035: [s390x] Disable JSR166 test cases which uses virtual threads
Reviewed-by: jpai, alanb, amitkumar
1 parent e3661b3 commit 4e7106d

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

test/jdk/java/util/concurrent/tck/JSR166TestCase.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
/*
3838
* @test id=default
3939
* @summary Conformance testing variant of JSR-166 tck tests.
40+
* @library /test/lib
4041
* @build *
42+
* @build jdk.test.lib.Platform
4143
* @modules java.management java.base/jdk.internal.util
4244
* @run junit/othervm/timeout=1000 JSR166TestCase
4345
*/
@@ -46,7 +48,9 @@
4648
* @test id=forkjoinpool-common-parallelism
4749
* @summary Test implementation details variant of JSR-166
4850
* tck tests with ForkJoinPool common parallelism.
51+
* @library /test/lib
4952
* @build *
53+
* @build jdk.test.lib.Platform
5054
* @modules java.management java.base/jdk.internal.util
5155
* @run junit/othervm/timeout=1000
5256
* --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -68,7 +72,9 @@
6872
* @summary Remaining test implementation details variant of
6973
* JSR-166 tck tests apart from ForkJoinPool common
7074
* parallelism.
75+
* @library /test/lib
7176
* @build *
77+
* @build jdk.test.lib.Platform
7278
* @modules java.management java.base/jdk.internal.util
7379
* @run junit/othervm/timeout=1000
7480
* --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -135,6 +141,7 @@
135141
import java.util.concurrent.atomic.AtomicReference;
136142
import java.util.regex.Pattern;
137143

144+
import jdk.test.lib.Platform;
138145
import junit.framework.Test;
139146
import junit.framework.TestCase;
140147
import junit.framework.TestResult;
@@ -624,6 +631,13 @@ public static Test suite() {
624631
"SynchronousQueue20Test",
625632
"ReentrantReadWriteLock20Test"
626633
};
634+
635+
if (Platform.isS390x()) {
636+
java20TestClassNames = new String[] {
637+
"ForkJoinPool20Test",
638+
};
639+
}
640+
627641
addNamedTestClasses(suite, java20TestClassNames);
628642
}
629643

0 commit comments

Comments
 (0)