diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-27 16:00:18 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-27 17:05:47 -0800 |
| commit | 9575ee9961df08e3e83b473c40f41a1e3548fb8d (patch) | |
| tree | 9b69556455793205d957085b6e6950b3cfe9d7f7 | |
| parent | 1284c3c6f38cc419a0a39fd68b3d5cf81b36b1a5 (diff) | |
| download | scala-9575ee9961df08e3e83b473c40f41a1e3548fb8d.tar.gz scala-9575ee9961df08e3e83b473c40f41a1e3548fb8d.tar.bz2 scala-9575ee9961df08e3e83b473c40f41a1e3548fb8d.zip | |
Remove -deprecation from partest default options.
Who knows why it was ever like this; it's not like anyone
sees the deprecation warnings. In PR #1807 there is now a
test which depends on partest not making this move, so it's
a good time to finally expunge it.
| -rw-r--r-- | src/partest/scala/tools/partest/PartestDefaults.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 1 | ||||
| -rw-r--r-- | test/files/neg/classmanifests_new_deprecations.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/for-comprehension-old.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/macro-deprecate-idents.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/macro-invalidshape-d.flags | 2 | ||||
| -rw-r--r-- | test/files/neg/names-defaults-neg.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/t5589neg.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/t5956.flags | 1 |
9 files changed, 8 insertions, 5 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 diff --git a/test/files/neg/classmanifests_new_deprecations.flags b/test/files/neg/classmanifests_new_deprecations.flags index e8fb65d50c..c6bfaf1f64 100644 --- a/test/files/neg/classmanifests_new_deprecations.flags +++ b/test/files/neg/classmanifests_new_deprecations.flags @@ -1 +1 @@ --Xfatal-warnings
\ No newline at end of file +-deprecation -Xfatal-warnings diff --git a/test/files/neg/for-comprehension-old.flags b/test/files/neg/for-comprehension-old.flags new file mode 100644 index 0000000000..dcc59ebe32 --- /dev/null +++ b/test/files/neg/for-comprehension-old.flags @@ -0,0 +1 @@ +-deprecation diff --git a/test/files/neg/macro-deprecate-idents.flags b/test/files/neg/macro-deprecate-idents.flags index e8fb65d50c..c6bfaf1f64 100644 --- a/test/files/neg/macro-deprecate-idents.flags +++ b/test/files/neg/macro-deprecate-idents.flags @@ -1 +1 @@ --Xfatal-warnings
\ No newline at end of file +-deprecation -Xfatal-warnings diff --git a/test/files/neg/macro-invalidshape-d.flags b/test/files/neg/macro-invalidshape-d.flags index cd66464f2f..83b7265eb9 100644 --- a/test/files/neg/macro-invalidshape-d.flags +++ b/test/files/neg/macro-invalidshape-d.flags @@ -1 +1 @@ --language:experimental.macros
\ No newline at end of file +-deprecation -language:experimental.macros diff --git a/test/files/neg/names-defaults-neg.flags b/test/files/neg/names-defaults-neg.flags new file mode 100644 index 0000000000..dcc59ebe32 --- /dev/null +++ b/test/files/neg/names-defaults-neg.flags @@ -0,0 +1 @@ +-deprecation diff --git a/test/files/neg/t5589neg.flags b/test/files/neg/t5589neg.flags new file mode 100644 index 0000000000..dcc59ebe32 --- /dev/null +++ b/test/files/neg/t5589neg.flags @@ -0,0 +1 @@ +-deprecation diff --git a/test/files/neg/t5956.flags b/test/files/neg/t5956.flags new file mode 100644 index 0000000000..dcc59ebe32 --- /dev/null +++ b/test/files/neg/t5956.flags @@ -0,0 +1 @@ +-deprecation |