From 6d633716ab45a29147574b119b195049cf8278d6 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Wed, 26 Sep 2012 21:18:03 +0200 Subject: hardens DirectTest against missing -d settings And also explicitly specifies -d in a test where I forgot to do that. Double checking never hurts. --- src/partest/scala/tools/partest/DirectTest.scala | 2 +- test/files/run/typetags_without_scala_reflect_manifest_lookup.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/partest/scala/tools/partest/DirectTest.scala b/src/partest/scala/tools/partest/DirectTest.scala index ff047daf9e..af2fc986fa 100644 --- a/src/partest/scala/tools/partest/DirectTest.scala +++ b/src/partest/scala/tools/partest/DirectTest.scala @@ -37,7 +37,7 @@ abstract class DirectTest extends App { } // new compiler def newCompiler(args: String*): Global = { - val settings = newSettings((CommandLineParser tokenize extraSettings) ++ args.toList) + val settings = newSettings((CommandLineParser tokenize ("-d \"" + testOutput.path + "\" " + extraSettings)) ++ args.toList) if (settings.Yrangepos.value) new Global(settings) with interactive.RangePositions else new Global(settings) } diff --git a/test/files/run/typetags_without_scala_reflect_manifest_lookup.scala b/test/files/run/typetags_without_scala_reflect_manifest_lookup.scala index 37047e7884..6fd3d2dc2b 100644 --- a/test/files/run/typetags_without_scala_reflect_manifest_lookup.scala +++ b/test/files/run/typetags_without_scala_reflect_manifest_lookup.scala @@ -2,7 +2,7 @@ import scala.tools.partest._ import scala.tools.nsc.Settings object Test extends DirectTest { - override def extraSettings = "-cp " + sys.props("partest.lib") + override def extraSettings = "-cp " + sys.props("partest.lib") + " -d \"" + testOutput.path + "\"" def code = """ object Test extends App { -- cgit v1.2.3