More merge fixes.

maraist · Mar 26, 2018 · 4ac1adf · 4ac1adf
1 parent 9ab90ae
commit 4ac1adf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/...ruffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/CPUSamplerTest.java b/...ruffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/CPUSamplerTest.java
@@ -24,12 +24,6 @@
  */
 package com.oracle.truffle.tools.profiler.test;
 
-
-import com.oracle.truffle.tools.profiler.CPUSampler;
-import com.oracle.truffle.tools.profiler.ProfilerNode;
-import com.oracle.truffle.tools.profiler.impl.CPUSamplerInstrument;
-import org.graalvm.polyglot.Instrument;
-
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -169,7 +163,7 @@ public void testCorrectRootStructureRecursive() {
         Assert.assertEquals("foo", foo.getRootName());
         checkTimeline(foo.getPayload());
 
-        // RECURSIVE_CALL does recutions to depth 10
+        // RECURSIVE_CALL does recursions to depth 10
         for (int i = 0; i < 10; i++) {
             children = foo.getChildren();
             Assert.assertEquals(1, children.size());

diff --git a/...truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/CPUTracerTest.java b/...truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/CPUTracerTest.java
@@ -24,9 +24,10 @@
  */
 package com.oracle.truffle.tools.profiler.test;
 
-import com.oracle.truffle.tools.profiler.CPUTracer;
-import com.oracle.truffle.tools.profiler.impl.CPUTracerInstrument;
-import org.graalvm.polyglot.Instrument;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.graalvm.polyglot.Source;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...ffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java b/...ffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java
@@ -24,10 +24,8 @@
  */
 package com.oracle.truffle.tools.profiler.test;
 
-import com.oracle.truffle.tools.profiler.MemoryTracer;
-import com.oracle.truffle.tools.profiler.ProfilerNode;
-import com.oracle.truffle.tools.profiler.impl.MemoryTracerInstrument;
-import org.graalvm.polyglot.Instrument;
+import java.util.Collection;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;