Skip to content

Commit ede2d53

Browse files
committed
Get rid off custom classpath in entry point tests
1 parent 6700dbd commit ede2d53

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

compiler/test/dotty/tools/dotc/EntryPointsTest.scala

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ import scala.collection.mutable.ListBuffer
2020
class EntryPointsTest {
2121
private val sources =
2222
List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
23-
private val dottyInterfaces =
24-
new java.io.File(Jars.dottyInterfaces).getPath
25-
private val dottyLibrary =
26-
new java.io.File(Jars.dottyLib).getPath
27-
private val args =
28-
sources ++
29-
List("-d", "../out/") ++
30-
List("-classpath", dottyInterfaces + ":" + dottyLibrary)
23+
private val args = sources ++ List("-d", "../out/", "-usejavacp")
3124

3225
@Test def runCompiler = {
3326
val reporter = new CustomReporter

compiler/test/dotty/tools/dotc/InterfaceEntryPointTest.scala

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,7 @@ class InterfaceEntryPointTest {
2121
@Test def runCompilerFromInterface = {
2222
val sources =
2323
List("../tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath())
24-
val dottyInterfaces =
25-
new java.io.File(Jars.dottyInterfaces).getPath
26-
val dottyLibrary =
27-
new java.io.File(Jars.dottyLib).getPath
28-
29-
val args =
30-
sources ++
31-
List("-d", "../out/") ++
32-
List("-classpath", dottyInterfaces + ":" + dottyLibrary)
24+
val args = sources ++ List("-d", "../out/", "-usejavacp")
3325

3426
val mainClass = Class.forName("dotty.tools.dotc.Main")
3527
val process = mainClass.getMethod("process",

0 commit comments

Comments
 (0)