diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-25 16:34:57 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-25 16:34:57 -0800 |
| commit | 1e1d6b42d05df6c1a69ef83463986847648831d9 (patch) | |
| tree | 98cd014636542dfd07abcf12aae08c59b9e30c9b /src/partest | |
| parent | 1eee7a22912dbc8d8d52d42a4bcaf6642b0fffe0 (diff) | |
| parent | e7ecaa00bbd5387870d0c26df4d8fba128b59c9e (diff) | |
| download | scala-1e1d6b42d05df6c1a69ef83463986847648831d9.tar.gz scala-1e1d6b42d05df6c1a69ef83463986847648831d9.tar.bz2 scala-1e1d6b42d05df6c1a69ef83463986847648831d9.zip | |
Merge commit 'e7ecaa00bb' into pr/merge-2.10
Conflicts:
test/partest
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/SBTRunner.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index d320f20616..13207b16fd 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -346,7 +346,7 @@ class PartestTask extends Task with CompilationPathProperty { javacmd foreach (x => antFileManager.JAVACMD = x.getAbsolutePath) javaccmd foreach (x => antFileManager.JAVAC_CMD = x.getAbsolutePath) - scalacArgsFlat foreach (antFileManager.SCALAC_OPTS = _) + scalacArgsFlat foreach (antFileManager.SCALAC_OPTS ++= _) timeout foreach (antFileManager.timeout = _) type TFSet = (Array[File], String, String) diff --git a/src/partest/scala/tools/partest/nest/SBTRunner.scala b/src/partest/scala/tools/partest/nest/SBTRunner.scala index b0ce6579ac..20f9c701d5 100644 --- a/src/partest/scala/tools/partest/nest/SBTRunner.scala +++ b/src/partest/scala/tools/partest/nest/SBTRunner.scala @@ -46,7 +46,7 @@ object SBTRunner extends DirectRunner { case x => sys.error("Unknown command line options: " + x) } val config = parseArgs(args, CommandLineOptions()) - fileManager.SCALAC_OPTS = config.scalacOptions + fileManager.SCALAC_OPTS ++= config.scalacOptions fileManager.CLASSPATH = config.classpath getOrElse sys.error("No classpath set") def findClasspath(jar: String, name: String): Option[String] = { |