aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotty/tools/dotc/repl
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-11-23 15:42:46 +0100
committerFelix Mulder <felix.mulder@gmail.com>2016-11-23 18:08:53 +0100
commitfa6054b874d1a9b6428d30f88a0346fc994c97de (patch)
tree58aa2745cbd0216fbe5bbe60d4bc52b7637093da /compiler/test/dotty/tools/dotc/repl
parente0439545c598478a9c619ae704d7859f866e0664 (diff)
downloaddotty-fa6054b874d1a9b6428d30f88a0346fc994c97de.tar.gz
dotty-fa6054b874d1a9b6428d30f88a0346fc994c97de.tar.bz2
dotty-fa6054b874d1a9b6428d30f88a0346fc994c97de.zip
Make tests depend on environment variables for classpath jars
sbt adds the correct jars to classpath and the tests depend on `packageAll` which creates these. When using something else however, these together with `sbt-interfaces` do not get propagated from the build. To remedy this and make the testing a bit more flexible, we now take these from `sys.props` instead, see `tests/dotty/Jars.scala`. If the props aren't defined we fall back to the ones default to sbt.
Diffstat (limited to 'compiler/test/dotty/tools/dotc/repl')
-rw-r--r--compiler/test/dotty/tools/dotc/repl/TestREPL.scala8
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/test/dotty/tools/dotc/repl/TestREPL.scala b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala
index 2263e85a0..70f701791 100644
--- a/compiler/test/dotty/tools/dotc/repl/TestREPL.scala
+++ b/compiler/test/dotty/tools/dotc/repl/TestREPL.scala
@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty
+package tools.dotc
package repl
import core.Contexts.Context
@@ -23,10 +24,7 @@ class TestREPL(script: String) extends REPL {
override def context(ctx: Context) = {
val fresh = ctx.fresh
fresh.setSetting(ctx.settings.color, "never")
- fresh.setSetting(
- ctx.settings.classpath,
- "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
- )
+ fresh.setSetting(ctx.settings.classpath, Jars.dottyLib)
fresh.initialize()(fresh)
fresh
}