|
37 | 37 | /* |
38 | 38 | * @test id=default |
39 | 39 | * @summary Conformance testing variant of JSR-166 tck tests. |
| 40 | + * @library /test/lib |
40 | 41 | * @build * |
| 42 | + * @build jdk.test.lib.Platform |
41 | 43 | * @modules java.management java.base/jdk.internal.util |
42 | 44 | * @run junit/othervm/timeout=1000 JSR166TestCase |
43 | 45 | */ |
|
46 | 48 | * @test id=forkjoinpool-common-parallelism |
47 | 49 | * @summary Test implementation details variant of JSR-166 |
48 | 50 | * tck tests with ForkJoinPool common parallelism. |
| 51 | + * @library /test/lib |
49 | 52 | * @build * |
| 53 | + * @build jdk.test.lib.Platform |
50 | 54 | * @modules java.management java.base/jdk.internal.util |
51 | 55 | * @run junit/othervm/timeout=1000 |
52 | 56 | * --add-opens java.base/java.util.concurrent=ALL-UNNAMED |
|
68 | 72 | * @summary Remaining test implementation details variant of |
69 | 73 | * JSR-166 tck tests apart from ForkJoinPool common |
70 | 74 | * parallelism. |
| 75 | + * @library /test/lib |
71 | 76 | * @build * |
| 77 | + * @build jdk.test.lib.Platform |
72 | 78 | * @modules java.management java.base/jdk.internal.util |
73 | 79 | * @run junit/othervm/timeout=1000 |
74 | 80 | * --add-opens java.base/java.util.concurrent=ALL-UNNAMED |
|
135 | 141 | import java.util.concurrent.atomic.AtomicReference; |
136 | 142 | import java.util.regex.Pattern; |
137 | 143 |
|
| 144 | +import jdk.test.lib.Platform; |
138 | 145 | import junit.framework.Test; |
139 | 146 | import junit.framework.TestCase; |
140 | 147 | import junit.framework.TestResult; |
@@ -624,6 +631,13 @@ public static Test suite() { |
624 | 631 | "SynchronousQueue20Test", |
625 | 632 | "ReentrantReadWriteLock20Test" |
626 | 633 | }; |
| 634 | + |
| 635 | + if (Platform.isS390x()) { |
| 636 | + java20TestClassNames = new String[] { |
| 637 | + "ForkJoinPool20Test", |
| 638 | + }; |
| 639 | + } |
| 640 | + |
627 | 641 | addNamedTestClasses(suite, java20TestClassNames); |
628 | 642 | } |
629 | 643 |
|
|
0 commit comments