SubprocessTest should only run the current unit test in the subprocess

Author: tkrodriguez

compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/PreviewEnabledTest.java

@@ -57,6 +57,6 @@ public void testBody() {
 
     @Test
     public void testInSubprocess() throws IOException, InterruptedException {
-        SubprocessTest.launchSubprocess(getClass(), this::testBody, "--enable-preview");
+        SubprocessTest.launchSubprocess(getClass(), currentUnitTestName(), this::testBody, "--enable-preview");
     }
 }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubprocessTest.java

@@ -67,29 +67,20 @@ public abstract class SubprocessTest extends GraalCompilerTest {
      *         {@link Subprocess} instance describing the process after its successful termination.
      */
     public SubprocessUtil.Subprocess launchSubprocess(Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, null, true, getClass(), null, runnable, args);
-    }
-
-    /**
-     * Like {@link #launchSubprocess(Runnable, String...)}, but with an extra {@code testSelector}
-     * to specify a specific test method to execute in the test class.
-     */
-    public SubprocessUtil.Subprocess launchSubprocess(String testSelector, Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, null, true, getClass(), testSelector, runnable, args);
+        return launchSubprocess(null, null, true, getClass(), currentUnitTestName(), runnable, args);
     }
 
     public SubprocessUtil.Subprocess launchSubprocess(Predicate<String> vmArgsFilter, Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, vmArgsFilter, true, getClass(), null, runnable, args);
+        return launchSubprocess(null, vmArgsFilter, true, getClass(), currentUnitTestName(), runnable, args);
     }
 
-    public static SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, null, true, testClass, null, runnable, args);
+    public SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, Runnable runnable, String... args) throws InterruptedException, IOException {
+        return launchSubprocess(null, null, true, testClass, currentUnitTestName(), runnable, args);
     }
 
-    public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>> testPredicate, Predicate<String> vmArgsFilter, boolean expectNormalExit,
-                    Class<? extends GraalCompilerTest> testClass, Runnable runnable, String... args)
+    public static SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, String testSelector, Runnable runnable, String... args)
                     throws InterruptedException, IOException {
-        return launchSubprocess(testPredicate, vmArgsFilter, expectNormalExit, testClass, null, runnable, args);
+        return launchSubprocess(null, null, true, testClass, testSelector, runnable, args);
     }
 
     private static List<String> filter(List<String> args, Predicate<String> vmArgsFilter) {
@@ -131,10 +122,8 @@ public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>>
 
             List<String> mainClassAndArgs = new LinkedList<>();
             mainClassAndArgs.add("com.oracle.mxtool.junit.MxJUnitWrapper");
-            String testName = testClass.getName();
-            if (testSelector != null) {
-                testName += "#" + testSelector;
-            }
+            assert testSelector != null : "must pass the name of the current unit test";
+            String testName = testClass.getName() + "#" + testSelector;
             mainClassAndArgs.add(testName);
             boolean junitVerbose = getProcessCommandLine().contains("-JUnitVerbose");
             if (junitVerbose) {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ReadEliminationCodeEmissionTest.java

@@ -60,7 +60,7 @@ public static int accessVolatile1Snippet(A a) {
 
     @Test
     public void accessVolatile1() {
-        runTest("accessVolatile1", new A(12));
+        runTest(currentUnitTestName(), new A(12));
     }
 
     public void runTest(String baseName, Object... args) {
@@ -120,7 +120,7 @@ public void runTest(String baseName, Object... args) {
                             "-Dgraal.Dump=:5"};
         }
         try {
-            subprocess = launchSubprocess(baseName, run, vmArgs);
+            subprocess = launchSubprocess(run, vmArgs);
         } catch (InterruptedException | IOException e) {
             throw new RuntimeException(e);
         }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GCBarrierEmissionTest.java

@@ -92,7 +92,7 @@ public static Object fieldReadBarrierSnippet(TestObject t) {
 
     @Test
     public void fieldReadBarrier() {
-        runTest("fieldReadBarrier", new TestObject());
+        runTest(new TestObject());
     }
 
     public static void fieldWriteBarrierSnippet(TestObject t, Object value) {
@@ -101,7 +101,7 @@ public static void fieldWriteBarrierSnippet(TestObject t, Object value) {
 
     @Test
     public void fieldWriteBarrier() {
-        runTest("fieldWriteBarrier", new TestObject(), "string");
+        runTest(new TestObject(), "string");
     }
 
     public static void volatileFieldWriteBarrierSnippet(TestObject t, Object value) {
@@ -110,7 +110,7 @@ public static void volatileFieldWriteBarrierSnippet(TestObject t, Object value)
 
     @Test
     public void volatileFieldWriteBarrier() {
-        runTest("volatileFieldWriteBarrier", new TestObject(), "string");
+        runTest(new TestObject(), "string");
     }
 
     public static void arrayWriteBarrierSnippet(Object[] t, Object value) {
@@ -119,7 +119,7 @@ public static void arrayWriteBarrierSnippet(Object[] t, Object value) {
 
     @Test
     public void arrayWriteBarrier() {
-        runTest("arrayWriteBarrier", new Object[1], "string");
+        runTest(new Object[1], "string");
     }
 
     public static void volatileArrayWriteBarrierSnippet(Object[] t, Object value) {
@@ -131,7 +131,7 @@ public static void volatileArrayWriteBarrierSnippet(Object[] t, Object value) {
 
     @Test
     public void volatileArrayWriteBarrier() {
-        runTest("volatileArrayWriteBarrier", new Object[1], "string");
+        runTest(new Object[1], "string");
     }
 
     public static void fieldWriteNullBarrierSnippet(TestObject t) {
@@ -140,7 +140,7 @@ public static void fieldWriteNullBarrierSnippet(TestObject t) {
 
     @Test
     public void fieldWriteNullBarrier() {
-        runTest("fieldWriteNullBarrier", new TestObject());
+        runTest(new TestObject());
     }
 
     public static void volatileFieldWriteNullBarrierSnippet(TestObject t) {
@@ -149,7 +149,7 @@ public static void volatileFieldWriteNullBarrierSnippet(TestObject t) {
 
     @Test
     public void volatileFieldWriteNullBarrier() {
-        runTest("volatileFieldWriteNullBarrier", new TestObject());
+        runTest(new TestObject());
     }
 
     public static void arrayWriteNullBarrierSnippet(Object[] t) {
@@ -158,7 +158,7 @@ public static void arrayWriteNullBarrierSnippet(Object[] t) {
 
     @Test
     public void arrayWriteNullBarrier() {
-        runTest("arrayWriteNullBarrier", new Object[]{new Object[1]});
+        runTest(new Object[]{new Object[1]});
     }
 
     public static Object valueCompareAndSwapBarrierSnippet(TestObject t1, Object value) {
@@ -174,7 +174,7 @@ public void valueCompareAndSwapBarrier() {
             assertTrue(graph.getNodes().filter(ValueCompareAndSwapNode.class).isNotEmpty(), "expected ValueCompareAndSwapNode");
             return true;
         };
-        runTest("valueCompareAndSwapBarrier", nodePredicate, supply(TestObject::new), "string");
+        runTest(nodePredicate, supply(TestObject::new), "string");
     }
 
     public static boolean logicCompareAndSwapBarrierSnippet(TestObject t1, Object value) {
@@ -190,7 +190,7 @@ public void logicCompareAndSwapBarrier() {
             assertTrue(graph.getNodes().filter(LogicCompareAndSwapNode.class).isNotEmpty(), "expected LogicCompareAndSwapNode");
             return true;
         };
-        runTest("logicCompareAndSwapBarrier", nodePredicate, supply(TestObject::new), "string");
+        runTest(nodePredicate, supply(TestObject::new), "string");
     }
 
     public static Object getAndSetBarrierSnippet(TestObject t1, Object value) {
@@ -206,7 +206,7 @@ public void getAndSetBarrier() {
             assertTrue(graph.getNodes().filter(LoweredAtomicReadAndWriteNode.class).isNotEmpty(), "expected LoweredAtomicReadAndWriteNode");
             return true;
         };
-        runTest("getAndSetBarrier", nodePredicate, supply(TestObject::new), "string");
+        runTest(nodePredicate, supply(TestObject::new), "string");
     }
 
     public static boolean phantomRefersToBarrierSnippet(PhantomReference<Object> phantom, Object value) {
@@ -216,7 +216,7 @@ public static boolean phantomRefersToBarrierSnippet(PhantomReference<Object> pha
     @Test
     public void phantomRefersToBarrier() {
         ReferenceQueue<Object> queue = new ReferenceQueue<>();
-        runTest("phantomRefersToBarrier", new PhantomReference<>("string", queue), "string");
+        runTest(new PhantomReference<>("string", queue), "string");
     }
 
     public static boolean weakRefersToBarrierSnippet(WeakReference<Object> weak, Object value) {
@@ -225,7 +225,7 @@ public static boolean weakRefersToBarrierSnippet(WeakReference<Object> weak, Obj
 
     @Test
     public void weakRefersToBarrier() {
-        runTest("weakRefersToBarrier", new WeakReference<>("string"), "string");
+        runTest(new WeakReference<>("string"), "string");
     }
 
     public static Object referenceGetBarrierSnippet(WeakReference<Object> weak) {
@@ -234,7 +234,7 @@ public static Object referenceGetBarrierSnippet(WeakReference<Object> weak) {
 
     @Test
     public void referenceGetBarrier() {
-        runTest("referenceGetBarrier", new WeakReference<>("string"));
+        runTest(new WeakReference<>("string"));
     }
 
     public static TestObject objectAllocationBarrierSnippet() {
@@ -243,7 +243,7 @@ public static TestObject objectAllocationBarrierSnippet() {
 
     @Test
     public void objectAllocationBarrier() {
-        runTest("objectAllocationBarrier");
+        runTest();
     }
 
     public static String stringAllocationBarrierSnippet() {
@@ -252,7 +252,7 @@ public static String stringAllocationBarrierSnippet() {
 
     @Test
     public void stringAllocationBarrier() {
-        runTest("stringAllocationBarrier");
+        runTest();
     }
 
     private static TestObject obj6 = new TestObject(6);
@@ -265,7 +265,7 @@ public static Object testuuvCAESnippet() {
 
     @Test
     public void testuuvCAE() {
-        runTest("testuuvCAE");
+        runTest();
     }
 
     public static Object threadHandleBarrierSnippet() {
@@ -274,7 +274,7 @@ public static Object threadHandleBarrierSnippet() {
 
     @Test
     public void threadHandleBarrier() {
-        runTest("threadHandleBarrier");
+        runTest();
     }
 
     @Override
@@ -286,11 +286,12 @@ protected void checkLowTierGraph(StructuredGraph graph) {
 
     Predicate<StructuredGraph> graphPredicate;
 
-    public void runTest(String baseName, Object... args) {
-        runTest(baseName, null, args);
+    public void runTest(Object... args) {
+        runTest(null, args);
     }
 
-    public void runTest(String baseName, Predicate<StructuredGraph> predicate, Object... args) {
+    public void runTest(Predicate<StructuredGraph> predicate, Object... args) {
+        String baseName = currentUnitTestName();
         String snippetName = baseName + "Snippet";
         String methodSpec = getClass().getName() + "::" + snippetName;
         Method m = getMethod(snippetName);
@@ -350,7 +351,7 @@ public void runTest(String baseName, Predicate<StructuredGraph> predicate, Objec
                             "-XX:LogFile=" + logName};
         }
         try {
-            subprocess = launchSubprocess(baseName, run, vmArgs);
+            subprocess = launchSubprocess(run, vmArgs);
         } catch (InterruptedException | IOException e) {
             throw new RuntimeException(e);
         }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HumongousReferenceObjectTest.java

@@ -29,9 +29,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestName;
 
 import jdk.graal.compiler.core.test.SubprocessTest;
 import jdk.internal.vm.annotation.Contended;
@@ -53,8 +51,6 @@ public static void testSnippet() {
         }
     }
 
-    @Rule public TestName currentTest = new TestName();
-
     public void runSubprocessTest(String... args) throws IOException, InterruptedException {
         List<String> newArgs = new ArrayList<>();
         Collections.addAll(newArgs, args);
@@ -63,13 +59,13 @@ public void runSubprocessTest(String... args) throws IOException, InterruptedExc
         newArgs.remove("-XX:+UseG1GC");
         newArgs.remove("-XX:+UseParallelGC");
 
-        launchSubprocess(currentTest.getMethodName(), () -> {
+        launchSubprocess(() -> {
             test("testSnippet");
         }, newArgs.toArray(new String[0]));
 
         // Test without assertions as well
         newArgs.add("-da");
-        launchSubprocess(currentTest.getMethodName(), () -> {
+        launchSubprocess(() -> {
             test("testSnippet");
         }, newArgs.toArray(new String[0]));
     }

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/SafeConstructionTest.java

@@ -30,7 +30,14 @@
 import java.lang.reflect.Constructor;
 import java.util.List;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+
 import com.oracle.truffle.api.impl.asm.Opcodes;
+
 import jdk.graal.compiler.core.test.SubprocessTest;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
@@ -40,11 +47,6 @@
 import jdk.graal.compiler.test.AddExports;
 import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.junit.Assert;
-import org.junit.Test;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
 
 /**
  * Assert that a barrier is inserted at the end of a constructor that writes to Stable fields or if
@@ -89,7 +91,7 @@ public void checkAlwaysSafeConstructors() throws NoSuchMethodException {
 
     @Test
     public void runCheckStableWriteConstructors() throws IOException, InterruptedException {
-        launchSubprocess("runCheckStableWriteConstructors", this::checkStableWriteConstructors, "--add-opens=java.base/java.lang=ALL-UNNAMED");
+        launchSubprocess(this::checkStableWriteConstructors, "--add-opens=java.base/java.lang=ALL-UNNAMED");
     }
 
     private void checkStableWriteConstructors() {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/GraalTest.java

@@ -47,9 +47,11 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.AssumptionViolatedException;
+import org.junit.Rule;
 import org.junit.internal.ComparisonCriteria;
 import org.junit.internal.ExactComparisonCriteria;
 import org.junit.rules.DisableOnDebug;
+import org.junit.rules.TestName;
 import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 
@@ -72,6 +74,15 @@ public class GraalTest {
 
     public static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
+    @Rule public TestName currentUnitTestName = new TestName();
+
+    /**
+     * Returns the name of the current unit test being run.
+     */
+    public String currentUnitTestName() {
+        return currentUnitTestName.getMethodName();
+    }
+
     protected Method getMethod(String methodName) {
         return getMethod(getClass(), methodName);
     }