aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-04-05 16:12:43 +0200
committerFelix Mulder <felix.mulder@gmail.com>2017-04-12 11:31:13 +0200
commit923533ea86b53b90e343e4fc0f88956996a2ed5b (patch)
tree4060f34d1d811c820cc7d33a5b23331ac7b36d6b
parent7dcfbd71b1c05b4bc5e8c7e1da94fd99600e740f (diff)
downloaddotty-923533ea86b53b90e343e4fc0f88956996a2ed5b.tar.gz
dotty-923533ea86b53b90e343e4fc0f88956996a2ed5b.tar.bz2
dotty-923533ea86b53b90e343e4fc0f88956996a2ed5b.zip
Move vulpix to `dotty.tools.vulpix`
-rw-r--r--compiler/test/dotc/comptest.scala2
-rw-r--r--compiler/test/dotty/tools/vulpix/ChildMain.scala (renamed from compiler/test/dotty/tools/dotc/vulpix/ChildMain.scala)5
-rw-r--r--compiler/test/dotty/tools/vulpix/ParallelTesting.scala (renamed from compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala)10
-rw-r--r--compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala (renamed from compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala)2
-rw-r--r--compiler/test/dotty/tools/vulpix/Statuses.java (renamed from compiler/test/dotty/tools/dotc/vulpix/Statuses.java)2
-rw-r--r--compiler/test/dotty/tools/vulpix/SummaryReport.java (renamed from compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java)2
-rw-r--r--compiler/test/dotty/tools/vulpix/VulpixTests.scala (renamed from compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala)6
7 files changed, 13 insertions, 16 deletions
diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala
index ab55e0271..8737ef165 100644
--- a/compiler/test/dotc/comptest.scala
+++ b/compiler/test/dotc/comptest.scala
@@ -1,6 +1,6 @@
package dotc
-import dotty.tools.dotc.vulpix.ParallelTesting
+import dotty.tools.vulpix.ParallelTesting
import scala.concurrent.duration._
diff --git a/compiler/test/dotty/tools/dotc/vulpix/ChildMain.scala b/compiler/test/dotty/tools/vulpix/ChildMain.scala
index fdd602379..30059a9c5 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/ChildMain.scala
+++ b/compiler/test/dotty/tools/vulpix/ChildMain.scala
@@ -1,5 +1,4 @@
-package dotty.tools.dotc
-package vulpix
+package dotty.tools.vulpix
import java.io.{
File => JFile,
@@ -9,7 +8,7 @@ import java.io.{
}
import java.lang.reflect.InvocationTargetException
-import dotty.tools.dotc.vulpix.Statuses._
+import dotty.tools.vulpix.Statuses._
object ChildMain {
val realStdin = System.in
diff --git a/compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
index 28c2ea22b..9b9f0a2bb 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -1,6 +1,5 @@
package dotty
package tools
-package dotc
package vulpix
import java.io.{ File => JFile }
@@ -17,11 +16,12 @@ import scala.collection.mutable
import scala.util.matching.Regex
import scala.util.Random
-import core.Contexts._
-import reporting.{ Reporter, TestReporter }
-import reporting.diagnostic.MessageContainer
-import interfaces.Diagnostic.ERROR
+import dotc.core.Contexts._
+import dotc.reporting.{ Reporter, TestReporter }
+import dotc.reporting.diagnostic.MessageContainer
+import dotc.interfaces.Diagnostic.ERROR
import dotc.util.DiffUtil
+import dotc.{ Driver, Compiler }
import vulpix.Statuses._
diff --git a/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala b/compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala
index 9dc808af7..a75b1c564 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/RunnerOrchestration.scala
+++ b/compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala
@@ -1,4 +1,4 @@
-package dotty.tools.dotc
+package dotty.tools
package vulpix
import java.io.{
diff --git a/compiler/test/dotty/tools/dotc/vulpix/Statuses.java b/compiler/test/dotty/tools/vulpix/Statuses.java
index bec687d01..68add30eb 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/Statuses.java
+++ b/compiler/test/dotty/tools/vulpix/Statuses.java
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.vulpix;
+package dotty.tools.vulpix;
import java.io.Serializable;
diff --git a/compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java b/compiler/test/dotty/tools/vulpix/SummaryReport.java
index 4f2b6350b..61a708f26 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java
+++ b/compiler/test/dotty/tools/vulpix/SummaryReport.java
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.vulpix;
+package dotty.tools.vulpix;
import org.junit.BeforeClass;
import org.junit.AfterClass;
diff --git a/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala b/compiler/test/dotty/tools/vulpix/VulpixTests.scala
index 1a1775995..bebcc7601 100644
--- a/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala
+++ b/compiler/test/dotty/tools/vulpix/VulpixTests.scala
@@ -1,6 +1,4 @@
-package dotty
-package tools
-package dotc
+package dotty.tools
package vulpix
import org.junit.Assert._
@@ -10,7 +8,7 @@ import scala.concurrent.duration._
import scala.util.control.NonFatal
class VulpixTests extends ParallelTesting {
- import CompilationTests._
+ import dotc.CompilationTests._
def maxDuration = 3.seconds
def numberOfSlaves = 5