diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-24 16:43:48 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-24 16:43:48 -0800 |
| commit | e7ecaa00bbd5387870d0c26df4d8fba128b59c9e (patch) | |
| tree | 33618eda7511577269998322e36b8b15069fc19b | |
| parent | 40bf1d8d8e300cab0f9a5f8dc78fc26a8e44f869 (diff) | |
| parent | d972336af84b0d26c37faaa8b506adc8bba7e02c (diff) | |
| download | scala-e7ecaa00bbd5387870d0c26df4d8fba128b59c9e.tar.gz scala-e7ecaa00bbd5387870d0c26df4d8fba128b59c9e.tar.bz2 scala-e7ecaa00bbd5387870d0c26df4d8fba128b59c9e.zip | |
Merge pull request #1949 from khernyo/partest-scalac-opts-fix
Use the same default scalac options in all three partest frontends
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/SBTRunner.scala | 2 | ||||
| -rwxr-xr-x | test/partest | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index d9f2bfe765..0199400ada 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -355,7 +355,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] = { diff --git a/test/partest b/test/partest index 8352f8a946..186c0d1580 100755 --- a/test/partest +++ b/test/partest @@ -77,7 +77,6 @@ fi # last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the # supplied argument will be used. JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS" -[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" partestDebugStr="" if [ ! -z "${PARTEST_DEBUG}" ] ; then |