From 805884cb664467ae97922e1afe44891c64fcfde2 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Wed, 19 Oct 2016 15:03:26 +0200
Subject: Remove compiler when running applications via dotr

---
 bin/dotr                                 | 3 +--
 test/dotty/partest/DPConsoleRunner.scala | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/dotr b/bin/dotr
index 8a495e780..553b831ca 100755
--- a/bin/dotr
+++ b/bin/dotr
@@ -11,8 +11,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.."  # absolute
 # Load common functions and variables
 source $DOTTY_ROOT/bin/common
 
-# CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR
-CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/classes/:.:$SCALA_LIBRARY_JAR"
+CLASS_PATH="-classpath .:$DOTTY_LIB_JAR:.:$SCALA_LIBRARY_JAR"
 
 function runMain {
     local jbin=$(which "java")
diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala
index d445722c9..18fac4de8 100644
--- a/test/dotty/partest/DPConsoleRunner.scala
+++ b/test/dotty/partest/DPConsoleRunner.scala
@@ -302,7 +302,11 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
   }
 
   // override to add dotty and scala jars to classpath
-  override def extraClasspath = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath
+  override def extraClasspath = {
+    val cp = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath
+    println(s"extraClasspath: $cp")
+    cp
+  }
 
   // override to keep class files if failed and delete clog if ok
   override def cleanup = if (lastState.isOk) {
-- 
cgit v1.2.3