Skip to content

Commit 8bf6f44

Browse files
committed
Share Panama support test helper
1 parent e9ab5a4 commit 8bf6f44

11 files changed

Lines changed: 27 additions & 11 deletions

File tree

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/Utils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -47,6 +47,7 @@
4747

4848
public class Utils {
4949
public static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
50+
public static final boolean SUPPORTS_PANAMA = Runtime.version().feature() >= 22;
5051

5152
public static String getThreadDump() {
5253
ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/AsyncActionThreadingTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
*/
4141
package com.oracle.graal.python.test.integration.advanced;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
4344
import static org.junit.Assert.assertEquals;
4445
import static org.junit.Assert.assertTrue;
4546

@@ -77,7 +78,7 @@ Stream<Thread> pythonThreads() {
7778
@Test
7879
public void testNoNewThreadsWithoutAutomaticAsyncActions() {
7980
Assume.assumeTrue("false".equalsIgnoreCase(System.getProperty("python.AutomaticAsyncActions")));
80-
Assume.assumeTrue("Requires JEP 454 support for _testcapi", Runtime.version().feature() >= 22);
81+
Assume.assumeTrue("Requires JEP 454 support for _testcapi", SUPPORTS_PANAMA);
8182
long threadCount = pythonThreadCount();
8283
Context c = PythonTests.enterContext(Map.of("python.AllowSignalHandlers", "true", "python.PosixModuleBackend", "native"), new String[0]);
8384
try {

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/NativeExtTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
*/
4141
package com.oracle.graal.python.test.integration.advanced;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
44+
4345
import java.io.IOException;
4446
import java.nio.file.Files;
4547
import java.nio.file.Path;
@@ -64,7 +66,7 @@ public class NativeExtTest {
6466
@BeforeClass
6567
public static void setUpClass() {
6668
Assume.assumeFalse(System.getProperty("os.name").toLowerCase().contains("mac"));
67-
Assume.assumeTrue(Runtime.version().feature() >= 22);
69+
Assume.assumeTrue(SUPPORTS_PANAMA);
6870
}
6971

7072
@Test

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/advanced/ShutdownTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
*/
4141
package com.oracle.graal.python.test.integration.advanced;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
44+
4345
import java.util.concurrent.CountDownLatch;
4446
import java.util.concurrent.TimeUnit;
4547
import java.util.concurrent.atomic.AtomicReference;
@@ -59,7 +61,7 @@ public class ShutdownTest extends PythonTests {
5961
@BeforeClass
6062
public static void setUpClass() {
6163
Assume.assumeFalse(System.getProperty("os.name").toLowerCase().contains("mac"));
62-
Assume.assumeTrue(Runtime.version().feature() >= 22);
64+
Assume.assumeTrue(SUPPORTS_PANAMA);
6365
}
6466

6567
@Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/cext/test/MultithreadedImportTestJava.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
package com.oracle.graal.python.cext.test;
4242

4343
import static com.oracle.graal.python.cext.test.MultithreadedImportTestBase.multithreadedImportTest;
44+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
4445

4546
import org.graalvm.polyglot.Context;
4647
import org.junit.Assume;
@@ -50,7 +51,7 @@
5051
public class MultithreadedImportTestJava {
5152
@BeforeClass
5253
public static void setUpClass() {
53-
Assume.assumeTrue(Runtime.version().feature() >= 22);
54+
Assume.assumeTrue(SUPPORTS_PANAMA);
5455
}
5556

5657
@Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/cext/test/MultithreadedImportTestNative.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
*/
4141
package com.oracle.graal.python.cext.test;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
44+
4345
import org.graalvm.polyglot.Context;
4446
import org.junit.Assume;
4547
import org.junit.BeforeClass;
@@ -48,7 +50,7 @@
4850
public class MultithreadedImportTestNative extends MultithreadedImportTestBase {
4951
@BeforeClass
5052
public static void setUpClass() {
51-
Assume.assumeTrue(Runtime.version().feature() >= 22);
53+
Assume.assumeTrue(SUPPORTS_PANAMA);
5254
}
5355

5456
@Test

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/SocketTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import static com.oracle.graal.python.runtime.PosixConstants.SO_TYPE;
7575
import static com.oracle.graal.python.runtime.PosixConstants.TCP_NODELAY;
7676
import static com.oracle.graal.python.runtime.PosixConstants.TCP_USER_TIMEOUT;
77+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
7778
import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
7879
import static org.hamcrest.CoreMatchers.anyOf;
7980
import static org.hamcrest.CoreMatchers.equalTo;
@@ -142,7 +143,7 @@ public class SocketTests {
142143

143144
@Parameters(name = "{0}")
144145
public static String[] params() {
145-
return Runtime.version().feature() >= 22 ? new String[]{"java", "native"} : new String[]{"java"};
146+
return SUPPORTS_PANAMA ? new String[]{"java", "native"} : new String[]{"java"};
146147
}
147148

148149
@Rule public WithPythonContextRule withPythonContextRule = new WithPythonContextRule((o) -> o.put("python.PosixModuleBackend", backendName));

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/PathConversionNodeTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
import static com.oracle.graal.python.test.PythonTests.ts;
4444
import static com.oracle.graal.python.test.integration.Utils.IS_WINDOWS;
45+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
4546
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
4647

4748
import java.math.BigInteger;
@@ -83,7 +84,7 @@ public class PathConversionNodeTests extends ConversionNodeTests {
8384

8485
@Parameters(name = "{0}")
8586
public static String[] params() {
86-
return Runtime.version().feature() >= 22 ? new String[]{"java", "native"} : new String[]{"java"};
87+
return SUPPORTS_PANAMA ? new String[]{"java", "native"} : new String[]{"java"};
8788
}
8889

8990
@Before

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/objects/TpSlotsTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
*/
4141
package com.oracle.graal.python.test.builtin.objects;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
44+
4345
import java.util.EnumSet;
4446

4547
import org.junit.After;
@@ -65,7 +67,7 @@ public class TpSlotsTests {
6567

6668
@BeforeClass
6769
public static void setUpClass() {
68-
Assume.assumeTrue(Runtime.version().feature() >= 22);
70+
Assume.assumeTrue(SUPPORTS_PANAMA);
6971
}
7072

7173
@Before

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/objects/cext/SlotWrapperTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
*/
4141
package com.oracle.graal.python.test.builtin.objects.cext;
4242

43+
import static com.oracle.graal.python.test.integration.Utils.SUPPORTS_PANAMA;
4344
import static org.hamcrest.CoreMatchers.equalTo;
4445
import static org.hamcrest.CoreMatchers.instanceOf;
4546
import static org.hamcrest.CoreMatchers.not;
@@ -72,7 +73,7 @@ public class SlotWrapperTests {
7273
@BeforeClass
7374
public static void setUpClass() {
7475
Assume.assumeFalse(System.getProperty("os.name").toLowerCase().contains("mac"));
75-
Assume.assumeTrue(Runtime.version().feature() >= 22);
76+
Assume.assumeTrue(SUPPORTS_PANAMA);
7677
}
7778

7879
@Before

0 commit comments

Comments
 (0)