diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 13:15:45 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 14:47:14 -0800 |
| commit | fc386675692bfaa1d2eb7a96c2bc92b3ad471327 (patch) | |
| tree | 7d48f0ad3854f83bbe7543f130e67ce59cdc51d5 /src/partest | |
| parent | a03e77b8670faa133c76f4d7b29bf362246d20b5 (diff) | |
| parent | 1381cda86ddeca1b9829a9c53ff9372cfd816735 (diff) | |
| download | scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.tar.gz scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.tar.bz2 scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.zip | |
Merge branch '2.10.x'
Patches applied:
- rename of `dropRepeatedParamType` to `dropIllegalStarTypes` -- required since 8886d22cd6
- fixed test/files/neg/t6406-regextract.flags -- how could this have worked before?
Conflicts:
src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
src/library/scala/collection/LinearSeqOptimized.scala
src/library/scala/util/Properties.scala
test/files/run/streams.check
test/files/run/streams.scala
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/PartestDefaults.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestDefaults.scala b/src/partest/scala/tools/partest/PartestDefaults.scala index e3f1cb8bd9..5d98a8be81 100644 --- a/src/partest/scala/tools/partest/PartestDefaults.scala +++ b/src/partest/scala/tools/partest/PartestDefaults.scala @@ -19,7 +19,7 @@ object PartestDefaults { def javaCmd = propOrElse("partest.javacmd", "java") def javacCmd = propOrElse("partest.javac_cmd", "javac") def javaOpts = propOrElse("partest.java_opts", "") - def scalacOpts = propOrElse("partest.scalac_opts", "-deprecation") + def scalacOpts = propOrElse("partest.scalac_opts", "") def testBuild = propOrNone("partest.build") def errorCount = propOrElse("partest.errors", "0").toInt diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index 9a48c5ce2b..0e62f9a022 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -41,7 +41,6 @@ class ExtConsoleReporter(settings: Settings, val writer: PrintWriter) extends Co class TestSettings(cp: String, error: String => Unit) extends Settings(error) { def this(cp: String) = this(cp, _ => ()) - deprecation.value = true nowarnings.value = false encoding.value = "UTF-8" classpath.value = cp |