From fa6054b874d1a9b6428d30f88a0346fc994c97de Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 23 Nov 2016 15:42:46 +0100 Subject: 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. --- compiler/test/dotty/tools/ShowClassTests.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/test/dotty/tools/ShowClassTests.scala') diff --git a/compiler/test/dotty/tools/ShowClassTests.scala b/compiler/test/dotty/tools/ShowClassTests.scala index 3c730b716..4aa9e8845 100644 --- a/compiler/test/dotty/tools/ShowClassTests.scala +++ b/compiler/test/dotty/tools/ShowClassTests.scala @@ -1,4 +1,5 @@ -package dotty.tools +package dotty +package tools import dotc.core._ import dotc.core.Contexts._ @@ -18,8 +19,7 @@ class ShowClassTests extends DottyTest { ctx.setSetting(ctx.settings.encoding, "UTF8") ctx.setSetting( ctx.settings.classpath, - "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + - ":../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + Jars.dottyLib + ":" + Jars.dottyInterfaces ) base.initialize()(ctx) ctx -- cgit v1.2.3