aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala
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/InterfaceEntryPointTest.scala
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/InterfaceEntryPointTest.scala')
-rw-r--r--compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala
index b36ea2955..7589e6f3b 100644
--- a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala
+++ b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala
@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty
+package tools.dotc
import org.junit.Test
import org.junit.Assert._
@@ -21,9 +22,9 @@ class InterfaceEntryPointTest {
val sources =
List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
val dottyInterfaces =
- new java.io.File("../interfaces/dotty-interfaces-0.1-SNAPSHOT.jar").getPath
+ new java.io.File(Jars.dottyInterfaces).getPath
val dottyLibrary =
- new java.io.File("../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar").getPath
+ new java.io.File(Jars.dottyLib).getPath
val args =
sources ++