Skip to content

Commit 805884c

Browse files
felixmuldersmarter
authored andcommitted
Remove compiler when running applications via dotr
1 parent 2769e1b commit 805884c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

bin/dotr

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.." # absolute
1111
# Load common functions and variables
1212
source $DOTTY_ROOT/bin/common
1313

14-
# CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR
15-
CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/classes/:.:$SCALA_LIBRARY_JAR"
14+
CLASS_PATH="-classpath .:$DOTTY_LIB_JAR:.:$SCALA_LIBRARY_JAR"
1615

1716
function runMain {
1817
local jbin=$(which "java")

test/dotty/partest/DPConsoleRunner.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,11 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
302302
}
303303

304304
// override to add dotty and scala jars to classpath
305-
override def extraClasspath = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath
305+
override def extraClasspath = {
306+
val cp = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath
307+
println(s"extraClasspath: $cp")
308+
cp
309+
}
306310

307311
// override to keep class files if failed and delete clog if ok
308312
override def cleanup = if (lastState.isOk) {

0 commit comments

Comments
 (0)