SI-7003 Partest redirects stderr to log file

som-snytt · adriaanm · commit 2006c37378f4 · 2013-08-15T09:23:52.000-07:00
Some scalac output is on stderr, and it's useful to see that
in the log file, especially for debugging.

Adds a line filter for logs, specified as "filter: pattern"
in the test source.

Backslashes are made forward only when detected as paths.

Test alignments:

Deprecations which do not pertain to the system under test
are corrected in the obvious way.

When testing deprecated API, suppress warnings by deprecating
the Test object.

Check files are updated with useful true warnings, instead of
running under -nowarn.

Language feature imports as required, instead of running under -language.

Language feature not required, such as casual use of postfix.

Heed useful warning.

Ignore broken warnings. (Rarely, -nowarn.)

Inliner warnings pop up under -optimise only, so for now, just
filter them out where they occur.

Debug output from the test required an update.
diff --git a/test/files/run/json.scala b/test/files/run/json.scala
@@ -1,13 +1,17 @@
+/*
+ * filter: inliner warning(s); re-run with -Yinline-warnings for details
+ */
 import scala.util.parsing.json._
 import scala.collection.immutable.TreeMap
 
+@deprecated("Suppress warnings", since="2.11")
 object Test extends App {
   /* This method converts parsed JSON back into real JSON notation with objects in
    * sorted-key order. Not required by the spec, but it allows us to do a stable
    * toString comparison. */
   def jsonToString(in : Any) : String = in match {
     case l : List[_] => "[" + l.map(jsonToString).mkString(", ") + "]"
-    case m : Map[String,_] => "{" + m.iterator.toList
+    case m : Map[String @unchecked,_] => "{" + m.iterator.toList
          .sortWith({ (x,y) => x._1 < y._1 })
          .map({ case (k,v) => "\"" + k + "\": " + jsonToString(v) })
          .mkString(", ") + "}"
@@ -20,7 +24,7 @@ object Test extends App {
    */
   def sortJSON(in : Any) : Any = in match {
     case l : List[_] => l.map(sortJSON)
-    case m : Map[String,_] => TreeMap(m.mapValues(sortJSON).iterator.toSeq : _*)
+    case m : Map[String @unchecked,_] => TreeMap(m.mapValues(sortJSON).iterator.toSeq : _*)
     // For the object versions, sort their contents, ugly casts and all...
     case JSONObject(data) => JSONObject(sortJSON(data).asInstanceOf[Map[String,Any]])
     case JSONArray(data) => JSONArray(sortJSON(data).asInstanceOf[List[Any]])
diff --git a/test/files/run/t4929.scala b/test/files/run/t4929.scala
@@ -2,6 +2,7 @@ import scala.util.parsing.json._
 import java.util.concurrent._
 import collection.JavaConversions._
 
+@deprecated("Suppress warnings", since="2.11")
 object Test extends App {
 
   val LIMIT = 2000
diff --git a/test/files/run/unittest_io.scala b/test/files/run/unittest_io.scala
@@ -1,3 +1,5 @@
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
 
   def main(args: Array[String]) {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+`
	`2`	`+@deprecated("Suppress warnings", since="2.11")`
`1`	`3`	`object Test {`
`2`	`4`
`3`	`5`	`def main(args: Array[String]) {`