diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-11-23 16:59:54 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-11-23 18:08:54 +0100 |
commit | ede2d531f0df401e7dd73e6c3d9c9fe5f4702d4b (patch) | |
tree | b7c87c00e208077ff8eb1d5b93e634118186f1c3 /compiler | |
parent | 6700dbd6b4e6d809891840201df16b7fd2eaf625 (diff) | |
download | dotty-ede2d531f0df401e7dd73e6c3d9c9fe5f4702d4b.tar.gz dotty-ede2d531f0df401e7dd73e6c3d9c9fe5f4702d4b.tar.bz2 dotty-ede2d531f0df401e7dd73e6c3d9c9fe5f4702d4b.zip |
Get rid off custom classpath in entry point tests
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/test/dotty/tools/dotc/EntryPointsTest.scala | 9 | ||||
-rw-r--r-- | compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala | 10 |
2 files changed, 2 insertions, 17 deletions
diff --git a/compiler/test/dotty/tools/dotc/EntryPointsTest.scala b/compiler/test/dotty/tools/dotc/EntryPointsTest.scala index f095dc725..00918a282 100644 --- a/compiler/test/dotty/tools/dotc/EntryPointsTest.scala +++ b/compiler/test/dotty/tools/dotc/EntryPointsTest.scala @@ -20,14 +20,7 @@ import scala.collection.mutable.ListBuffer class EntryPointsTest { private val sources = List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) - private val dottyInterfaces = - new java.io.File(Jars.dottyInterfaces).getPath - private val dottyLibrary = - new java.io.File(Jars.dottyLib).getPath - private val args = - sources ++ - List("-d", "../out/") ++ - List("-classpath", dottyInterfaces + ":" + dottyLibrary) + private val args = sources ++ List("-d", "../out/", "-usejavacp") @Test def runCompiler = { val reporter = new CustomReporter diff --git a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala index 7589e6f3b..e27b0f7b8 100644 --- a/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala +++ b/compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala @@ -21,15 +21,7 @@ class InterfaceEntryPointTest { @Test def runCompilerFromInterface = { val sources = List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) - val dottyInterfaces = - new java.io.File(Jars.dottyInterfaces).getPath - val dottyLibrary = - new java.io.File(Jars.dottyLib).getPath - - val args = - sources ++ - List("-d", "../out/") ++ - List("-classpath", dottyInterfaces + ":" + dottyLibrary) + val args = sources ++ List("-d", "../out/", "-usejavacp") val mainClass = Class.forName("dotty.tools.dotc.Main") val process = mainClass.getMethod("process", |