From 8a61ff432543a29234193cd1f7c14abd3f3d31a0 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 2 Nov 2016 11:08:28 +0100 Subject: Move compiler and compiler tests to compiler dir --- bench/src/test/scala/Benchmarks.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bench') diff --git a/bench/src/test/scala/Benchmarks.scala b/bench/src/test/scala/Benchmarks.scala index b85f95d6e..8c1b18e66 100644 --- a/bench/src/test/scala/Benchmarks.scala +++ b/bench/src/test/scala/Benchmarks.scala @@ -6,7 +6,7 @@ import org.scalameter.PerformanceTest.OnlineRegressionReport import org.scalameter.api._ import org.scalameter.{Context, History, currentContext, persistence} import org.scalameter.reporting.RegressionReporter.Tester -import test.CompilerTest +import dotty.tools.dotc.CompilerTest import scala.io.Source @@ -46,13 +46,14 @@ object BenchTests extends OnlineRegressionReport { implicit val defaultOptions = List("-d", outputDir) val scala2mode = List("-language:Scala2") - val dottyDir = "./src/dotty/" + val dottyDir = "../compiler/src/dotty/" - val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines() + val stdlibFiles = Source.fromFile("../compiler/test/dotc/scala-collections.whitelist", "UTF8").getLines() .map(_.trim) // allow identation .filter(!_.startsWith("#")) // allow comment lines prefixed by # .map(_.takeWhile(_ != '#').trim) // allow comments in the end of line .filter(_.nonEmpty) + .map("." + _) .toList def stdLib = compiler.compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode) -- cgit v1.2.3