[fix,test] Make sure debug is initialized for timeout tests

Added GraalCompilerTest.initializeForTimeout() Call it from tests with a timeout (JUnit runs those on a different thread).
oracle · Jan 10, 2017 · 3c054a0 · 3c054a0
1 parent b0175e5
commit 3c054a0
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 46 deletions.
diff --git a/...g.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java b/...g.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java
@@ -22,8 +22,6 @@
  */
 package org.graalvm.compiler.core.test;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.common.RetryableBailoutException;
 import org.graalvm.compiler.core.common.util.CompilationAlarm;
 import org.graalvm.compiler.debug.GraalError;
@@ -32,6 +30,7 @@
 import org.graalvm.compiler.options.OptionValue;
 import org.graalvm.compiler.options.OptionValue.OverrideScope;
 import org.graalvm.compiler.phases.Phase;
+import org.junit.Test;
 
 public class CooperativePhaseTest extends GraalCompilerTest {
 
@@ -101,6 +100,7 @@ private static void sleep(long millis) {
     @Test(timeout = 60_000)
     @SuppressWarnings("try")
     public void test01() {
+        initializeForTimeout();
         StructuredGraph g = parseEager("snippet", AllowAssumptions.NO);
         try (OverrideScope o = OptionValue.override(CompilationAlarm.Options.CompilationExpirationPeriod, 1/* sec */);
                         CompilationAlarm c1 = CompilationAlarm.trackCompilationPeriod()) {
@@ -111,6 +111,7 @@ public void test01() {
     @Test(expected = RetryableBailoutException.class, timeout = 60_000)
     @SuppressWarnings("try")
     public void test02() {
+        initializeForTimeout();
         StructuredGraph g = parseEager("snippet", AllowAssumptions.NO);
         try (OverrideScope o = OptionValue.override(CompilationAlarm.Options.CompilationExpirationPeriod, 1/* sec */);
                         CompilationAlarm c1 = CompilationAlarm.trackCompilationPeriod()) {
@@ -121,6 +122,7 @@ public void test02() {
     @Test(timeout = 60_000)
     @SuppressWarnings("try")
     public void test03() {
+        initializeForTimeout();
         StructuredGraph g = parseEager("snippet", AllowAssumptions.NO);
         // 0 disables alarm utility
         try (OverrideScope o = OptionValue.override(CompilationAlarm.Options.CompilationExpirationPeriod, 0);
@@ -132,6 +134,7 @@ public void test03() {
     @Test(timeout = 60_000)
     @SuppressWarnings("try")
     public void test04() {
+        initializeForTimeout();
         StructuredGraph g = parseEager("snippet", AllowAssumptions.NO);
         new CooperativePhaseWithoutAlarm().apply(g);
     }

diff --git a/.../org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/.../org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
@@ -44,12 +44,6 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
-
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.api.test.Graal;
@@ -62,8 +56,10 @@
 import org.graalvm.compiler.debug.Debug;
 import org.graalvm.compiler.debug.Debug.Scope;
 import org.graalvm.compiler.debug.DebugDumpScope;
+import org.graalvm.compiler.debug.DebugEnvironment;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.debug.TTY;
+import org.graalvm.compiler.debug.internal.DebugScope;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeMap;
@@ -113,6 +109,11 @@
 import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.runtime.RuntimeProvider;
 import org.graalvm.compiler.test.GraalTest;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.internal.AssumptionViolatedException;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.BailoutException;
@@ -1202,4 +1203,15 @@ protected static boolean iterationCount(double i, boolean cond) {
     protected boolean isArchitecture(String name) {
         return name.equals(backend.getTarget().arch.getName());
     }
+
+    /**
+     * This method should be called in "timeout" tests which JUnit runs in a different thread.
+     */
+    public static void initializeForTimeout() {
+        if (Debug.isEnabled() && DebugScope.getConfig() == null) {
+            // timeout tests run in a separate thread which needs the DebugEnvironment to be
+            // initialized
+            DebugEnvironment.initialize(TTY.out);
+        }
+    }
 }
diff --git a/...compiler.core.test/src/org/graalvm/compiler/core/test/inlining/RecursiveInliningTest.java b/...compiler.core.test/src/org/graalvm/compiler/core/test/inlining/RecursiveInliningTest.java
@@ -29,8 +29,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.debug.Debug;
 import org.graalvm.compiler.debug.Debug.Scope;
@@ -48,6 +46,7 @@
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
+import org.junit.Test;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import sun.misc.Unsafe;
@@ -116,6 +115,7 @@ public void inlineDirectRecursiveLoopCallNoReads() {
     }
 
     private void testAndTime(String snippet) {
+        initializeForTimeout();
         for (int i = IterationsStart; i < IterationsEnd; i++) {
             StructuredGraph graph = getGraph(snippet, i);
             long elapsed = runAndTimeEarlyReadEliminationPhase(graph);

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java
@@ -22,9 +22,8 @@
  */
 package org.graalvm.compiler.jtt.hotspot;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Test6959129 extends JTTTest {
 
@@ -76,6 +75,7 @@ public static long maxMoves(int min, int max) {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public final class Monitor_contended01 extends JTTTest {
 
@@ -77,6 +76,7 @@ public static boolean test() throws InterruptedException {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Monitor_notowner01 extends JTTTest {
 
@@ -66,6 +65,7 @@ public void run() {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public final class Monitorenter01 extends JTTTest {
 
@@ -43,6 +42,7 @@ public static boolean test() {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public final class Monitorenter02 extends JTTTest {
 
@@ -47,6 +46,7 @@ private static boolean test2() {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait01.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Object_wait01 extends JTTTest {
 
@@ -62,21 +61,25 @@ public static boolean test(int i) throws InterruptedException {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test", 0);
     }
 
     @Test(timeout = 20000)
     public void run1() throws Throwable {
+        initializeForTimeout();
         runTest("test", 1);
     }
 
     @Test(timeout = 20000)
     public void run2() throws Throwable {
+        initializeForTimeout();
         runTest("test", 3);
     }
 
     @Test(timeout = 20000)
     public void run3() throws Throwable {
+        initializeForTimeout();
         runTest("test", 15);
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait02.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Object_wait02 extends JTTTest {
 
@@ -63,16 +62,19 @@ public static boolean test(int i) throws InterruptedException {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test", 0);
     }
 
     @Test(timeout = 20000)
     public void run1() throws Throwable {
+        initializeForTimeout();
         runTest("test", 1);
     }
 
     @Test(timeout = 20000)
     public void run2() throws Throwable {
+        initializeForTimeout();
         runTest("test", 2);
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait03.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Object_wait03 extends JTTTest {
 
@@ -69,16 +68,19 @@ private static void dowait() throws InterruptedException {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test", 0);
     }
 
     @Test(timeout = 20000)
     public void run1() throws Throwable {
+        initializeForTimeout();
         runTest("test", 1);
     }
 
     @Test(timeout = 20000)
     public void run2() throws Throwable {
+        initializeForTimeout();
         runTest("test", 2);
     }
 

diff --git a/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java b/graal/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Object_wait04.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 public class Object_wait04 extends JTTTest {
 
@@ -73,31 +72,37 @@ private static void dowait(int i) throws InterruptedException {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test", 0);
     }
 
     @Test(timeout = 20000)
     public void run1() throws Throwable {
+        initializeForTimeout();
         runTest("test", 1);
     }
 
     @Test(timeout = 20000)
     public void run2() throws Throwable {
+        initializeForTimeout();
         runTest("test", 2);
     }
 
     @Test(timeout = 20000)
     public void run3() throws Throwable {
+        initializeForTimeout();
         runTest("test", 3);
     }
 
     @Test(timeout = 20000)
     public void run4() throws Throwable {
+        initializeForTimeout();
         runTest("test", 4);
     }
 
     @Test(timeout = 20000)
     public void run5() throws Throwable {
+        initializeForTimeout();
         runTest("test", 5);
     }
 

diff --git a/...org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java b/...org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java
@@ -24,9 +24,8 @@
  */
 package org.graalvm.compiler.jtt.threads;
 
-import org.junit.Test;
-
 import org.graalvm.compiler.jtt.JTTTest;
+import org.junit.Test;
 
 /**
  * Inspired by {@code com.sun.media.sound.DirectAudioDevice$DirectDL.drain()}.
@@ -55,6 +54,7 @@ public boolean test() {
 
     @Test(timeout = 20000)
     public void run0() throws Throwable {
+        initializeForTimeout();
         runTest("test");
     }