summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-31 00:06:16 -0800
committerPaul Phillips <paulp@improving.org>2012-12-31 00:06:16 -0800
commitca98602e8243062c8e1e86afe954c48edc09cbad (patch)
tree17a5883e9b01177613226307622f31b9bbdc1953 /src
parente0aec75c42602ee9773603433bea18d35c22ae06 (diff)
parent9575ee9961df08e3e83b473c40f41a1e3548fb8d (diff)
downloadscala-ca98602e8243062c8e1e86afe954c48edc09cbad.tar.gz
scala-ca98602e8243062c8e1e86afe954c48edc09cbad.tar.bz2
scala-ca98602e8243062c8e1e86afe954c48edc09cbad.zip
Merge pull request #1824 from paulp/pr/partest-likes-deprecation
Remove -deprecation from partest default options.
Diffstat (limited to 'src')
-rw-r--r--src/partest/scala/tools/partest/PartestDefaults.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/CompileManager.scala1
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 b27ce6ff75..a21c602d14 100644
--- a/src/partest/scala/tools/partest/PartestDefaults.scala
+++ b/src/partest/scala/tools/partest/PartestDefaults.scala
@@ -21,7 +21,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 188ebf66ed..3d902d6d00 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