Merge pull request #66 from szeiger/wip/scala-opts-for-scalac

szeiger · web-flow · commit 7c265b38352f · 2016-06-14T15:29:56.000+02:00
Use the correct scalac options when run from sbt
diff --git a/src/main/scala/scala/tools/partest/nest/DirectCompiler.scala b/src/main/scala/scala/tools/partest/nest/DirectCompiler.scala
@@ -67,7 +67,7 @@ class DirectCompiler(val runner: Runner) {
     val Xplugin = if (xplugs.isEmpty) Nil else List(xprefix +
       (xplugs map (_ stripPrefix xprefix) flatMap (_ split pathSeparator) map absolutize mkString pathSeparator)
     )
-    runner.suiteRunner.scalacExtraArgs ++ PartestDefaults.scalacOpts.split(' ') ++ others ++ Xplugin
+    runner.suiteRunner.scalacExtraArgs ++ runner.suiteRunner.scalacOpts.split(' ') ++ others ++ Xplugin
   }
 
   def compile(opts0: List[String], sources: List[File]): TestState = {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class DirectCompiler(val runner: Runner) {`
`67`	`67`	`val Xplugin = if (xplugs.isEmpty) Nil else List(xprefix +`
`68`	`68`	`(xplugs map (_ stripPrefix xprefix) flatMap (_ split pathSeparator) map absolutize mkString pathSeparator)`
`69`	`69`	`)`
`70`		`- runner.suiteRunner.scalacExtraArgs ++ PartestDefaults.scalacOpts.split(' ') ++ others ++ Xplugin`
	`70`	`+ runner.suiteRunner.scalacExtraArgs ++ runner.suiteRunner.scalacOpts.split(' ') ++ others ++ Xplugin`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`def compile(opts0: List[String], sources: List[File]): TestState = {`