diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-11-23 15:42:46 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-11-23 18:08:53 +0100 |
commit | fa6054b874d1a9b6428d30f88a0346fc994c97de (patch) | |
tree | 58aa2745cbd0216fbe5bbe60d4bc52b7637093da /compiler/test/dotty/tools/DottyTest.scala | |
parent | e0439545c598478a9c619ae704d7859f866e0664 (diff) | |
download | dotty-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/DottyTest.scala')
-rw-r--r-- | compiler/test/dotty/tools/DottyTest.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/test/dotty/tools/DottyTest.scala b/compiler/test/dotty/tools/DottyTest.scala index 77dc97bec..bd6b1cfa4 100644 --- a/compiler/test/dotty/tools/DottyTest.scala +++ b/compiler/test/dotty/tools/DottyTest.scala @@ -23,10 +23,7 @@ class DottyTest extends ContextEscapeDetection{ import base.settings._ val ctx = base.initialCtx.fresh ctx.setSetting(ctx.settings.encoding, "UTF8") - ctx.setSetting( - ctx.settings.classpath, - "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" - ) + ctx.setSetting(ctx.settings.classpath, Jars.dottyLib) // when classpath is changed in ctx, we need to re-initialize to get the // correct classpath from PathResolver base.initialize()(ctx) |