Make MultiContextCExtTest work when run purely with maven surefire

Author: timfel

graalpython/com.oracle.graal.python.test.integration/pom.xml

@@ -173,6 +173,12 @@ Additionally, one can change the polyglot artifacts version with
             <scope>runtime</scope>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <!-- See MultiContextCExtTest -->
+            <groupId>org.graalvm.python</groupId>
+            <artifactId>python-launcher</artifactId>
+            <version>${com.oracle.graal.python.test.polyglot.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.python</groupId>
             <artifactId>python-embedding</artifactId>

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/integration/MultiContextCExtTest.java

@@ -50,6 +50,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Set;
@@ -140,7 +141,17 @@ private static void deleteDirOnShutdown(Path tmpdir) {
     }
 
     private static Set<String> getClasspath() {
-        return Set.copyOf(Arrays.stream((System.getProperty("jdk.module.path") + File.pathSeparator + System.getProperty("java.class.path")).split(File.pathSeparator)).toList());
+        var sb = new ArrayList<String>();
+        var modPath = System.getProperty("jdk.module.path");
+        if (modPath != null) {
+            sb.add(modPath);
+        }
+        var classPath = System.getProperty("java.class.path");
+        if (classPath != null) {
+            sb.add(classPath);
+        }
+        var cp = String.join(File.pathSeparator, sb);
+        return Set.copyOf(Arrays.stream(cp.split(File.pathSeparator)).toList());
     }
 
     @Test

mx.graalpython/suite.py

@@ -1254,6 +1254,7 @@
             "distDependencies": [
                 "GRAALPYTHON",
                 "GRAALPYTHON_RESOURCES",
+                "GRAALPYTHON-LAUNCHER", # See MultiContextCExtTest
                 "GRAALPYTHON_EMBEDDING",
                 "GRAALPYTHON_EMBEDDING_TOOLS",
                 "sulong:SULONG_NATIVE", # See MultiContextTest#testSharingWithStruct