diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-26 22:54:01 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-26 22:54:01 -0700 |
| commit | 1d072fcb41aa1b0c0f09e9a4b16e56628a91465b (patch) | |
| tree | 6ba08fc859b665558e577ddbfe43116bbb5cd109 | |
| parent | 7fd83bbd6e5e39dccc545ac574629b53da1479f6 (diff) | |
| parent | 6d633716ab45a29147574b119b195049cf8278d6 (diff) | |
| download | scala-1d072fcb41aa1b0c0f09e9a4b16e56628a91465b.tar.gz scala-1d072fcb41aa1b0c0f09e9a4b16e56628a91465b.tar.bz2 scala-1d072fcb41aa1b0c0f09e9a4b16e56628a91465b.zip | |
Merge pull request #1408 from scalamacros/topic/direct-test
hardens DirectTest against missing -d settings
| -rw-r--r-- | src/partest/scala/tools/partest/DirectTest.scala | 2 | ||||
| -rw-r--r-- | 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 { |