SI-7003 Partest redirects stderr to log file

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.

58 files changed, 219 insertions, 68 deletions

diff --git a/test/files/jvm/actor-exceptions.scala b/test/files/jvm/actor-exceptions.scala
index 3ee4db9ed2..bdd983a0e8 100644
--- a/test/files/jvm/actor-exceptions.scala
+++ b/test/files/jvm/actor-exceptions.scala
@@ -1,4 +1,7 @@
 
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, Exit}
 import Actor._
 
@@ -58,7 +61,6 @@ object Slave extends Actor {
 
 case object A
 
-object Test {
   def main(args: Array[String]) {
     Master.start()
   }
diff --git a/test/files/jvm/actor-executor.scala b/test/files/jvm/actor-executor.scala
index b1f9caebdd..0fc28b4d85 100644
--- a/test/files/jvm/actor-executor.scala
+++ b/test/files/jvm/actor-executor.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import java.util.concurrent.Executors
 import scala.actors.{Actor, SchedulerAdapter}
 import Actor._
@@ -50,7 +54,6 @@ object Two extends AdaptedActor {
   }
 }
 
-object Test {
   val executor =
     Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())
 
diff --git a/test/files/jvm/actor-executor2.scala b/test/files/jvm/actor-executor2.scala
index f8fcaef69f..5badf2ae7e 100644
--- a/test/files/jvm/actor-executor2.scala
+++ b/test/files/jvm/actor-executor2.scala
@@ -1,3 +1,8 @@
+
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, SchedulerAdapter, Exit}
 import Actor._
 import java.util.concurrent.{Executors, RejectedExecutionException}
@@ -48,7 +53,6 @@ trait AdaptedActor extends Actor {
     Test.scheduler
 }
 
-object Test {
   val NUM_MSG = 100000
 
   val executor =
diff --git a/test/files/jvm/actor-executor3.scala b/test/files/jvm/actor-executor3.scala
index 4fde2c6c5f..f8b57d84b3 100644
--- a/test/files/jvm/actor-executor3.scala
+++ b/test/files/jvm/actor-executor3.scala
@@ -1,3 +1,8 @@
+
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.Actor
 import scala.actors.scheduler.ExecutorScheduler
 import java.util.concurrent.Executors
@@ -48,7 +53,6 @@ trait AdaptedActor extends Actor {
     Test.scheduler
 }
 
-object Test {
   val NUM_MSG = 100000
 
   val executor =
diff --git a/test/files/jvm/actor-getstate.scala b/test/files/jvm/actor-getstate.scala
index a6e15a8721..425efbe5e6 100644
--- a/test/files/jvm/actor-getstate.scala
+++ b/test/files/jvm/actor-getstate.scala
@@ -1,7 +1,9 @@
-import scala.actors.{Reactor, Actor, TIMEOUT}
-import Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.{Reactor, Actor, TIMEOUT}
+  import Actor._
 
   def assert(cond: => Boolean, hint: String) {
     if (!cond)
diff --git a/test/files/jvm/actor-link-getstate.scala b/test/files/jvm/actor-link-getstate.scala
index c24daf2eff..d8b8ada1e6 100644
--- a/test/files/jvm/actor-link-getstate.scala
+++ b/test/files/jvm/actor-link-getstate.scala
@@ -1,5 +1,9 @@
-import scala.actors.{Actor, Exit}
-import scala.actors.Actor._
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
+  import scala.actors.{Actor, Exit}
+  import scala.actors.Actor._
 
 case class MyException(text: String) extends Exception(text) {
   override def fillInStackTrace() = this
@@ -39,7 +43,6 @@ object Master extends Actor {
   }
 }
 
-object Test {
 
   def main(args: Array[String]) {
     actor {
diff --git a/test/files/jvm/actor-looping.scala b/test/files/jvm/actor-looping.scala
index 475d4754ce..7bc6f1e5c5 100644
--- a/test/files/jvm/actor-looping.scala
+++ b/test/files/jvm/actor-looping.scala
@@ -1,7 +1,8 @@
 
-import scala.actors.Actor._
 
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Actor._
   case object A
 
   def main(args: Array[String]) {
diff --git a/test/files/jvm/actor-normal-exit.scala b/test/files/jvm/actor-normal-exit.scala
index 20863d5bb0..90495866e2 100644
--- a/test/files/jvm/actor-normal-exit.scala
+++ b/test/files/jvm/actor-normal-exit.scala
@@ -1,7 +1,9 @@
 
-import scala.actors.{Actor, Exit}
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.{Actor, Exit}
   object Master extends Actor {
     trapExit = true
     def act() {
diff --git a/test/files/jvm/actor-receivewithin.scala b/test/files/jvm/actor-receivewithin.scala
index a5c87c2722..5982462502 100644
--- a/test/files/jvm/actor-receivewithin.scala
+++ b/test/files/jvm/actor-receivewithin.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, TIMEOUT}
 
 object A extends Actor {
@@ -62,7 +66,6 @@ object B extends Actor {
   }
 }
 
-object Test {
   def main(args:Array[String]) {
     B.start()
   }
diff --git a/test/files/jvm/actor-sync-send-timeout.scala b/test/files/jvm/actor-sync-send-timeout.scala
index 21e624bd0a..42e0be4a8c 100644
--- a/test/files/jvm/actor-sync-send-timeout.scala
+++ b/test/files/jvm/actor-sync-send-timeout.scala
@@ -1,8 +1,9 @@
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.Actor
 
 /* This test is a regression test for SI-4759.
  */
-object Test { 
   val Runs = 5
   
   def main(args: Array[String]) = {
@@ -14,7 +15,6 @@ object Test {
     }
     //println("done sending to A1")
   }
-}
 
 object A2 extends Actor {
   this.start()
@@ -45,3 +45,4 @@ object A1 extends Actor {
     }
   }
 }
+}
diff --git a/test/files/jvm/actor-termination.scala b/test/files/jvm/actor-termination.scala
index d8e44a2797..4a6bf92d48 100644
--- a/test/files/jvm/actor-termination.scala
+++ b/test/files/jvm/actor-termination.scala
@@ -1,8 +1,9 @@
-import scala.actors.Actor
 
 /* Test that an actor that hasn't finished prevents termination */
 
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Actor
   def main(args: Array[String]) {
     Actor.actor {
       try {
diff --git a/test/files/jvm/actor-uncaught-exception.scala b/test/files/jvm/actor-uncaught-exception.scala
index 5ae66de640..5285b7519f 100644
--- a/test/files/jvm/actor-uncaught-exception.scala
+++ b/test/files/jvm/actor-uncaught-exception.scala
@@ -1,10 +1,11 @@
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, Exit}
 
 class MyException(msg: String) extends Exception(msg) {
   override def fillInStackTrace() = this
 }
 
-object Test { 
 
   case object StartError extends Actor { 
     def act() { 
diff --git a/test/files/jvm/actor-uncaught-exception2.check b/test/files/jvm/actor-uncaught-exception2.check
index 870a5d32f9..a54f374aed 100644
--- a/test/files/jvm/actor-uncaught-exception2.check
+++ b/test/files/jvm/actor-uncaught-exception2.check
@@ -1,2 +1,2 @@
-UncaughtException(StartError,None,None,MyException: I don't want to run!)
-UncaughtException(MessageError,Some('ping),Some(Supervisor),MyException: No message for me!)
+UncaughtException(StartError,None,None,Test$MyException: I don't want to run!)
+UncaughtException(MessageError,Some('ping),Some(Supervisor),Test$MyException: No message for me!)
diff --git a/test/files/jvm/actor-uncaught-exception2.scala b/test/files/jvm/actor-uncaught-exception2.scala
index 0364cbeb03..f56217c187 100644
--- a/test/files/jvm/actor-uncaught-exception2.scala
+++ b/test/files/jvm/actor-uncaught-exception2.scala
@@ -1,11 +1,11 @@
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, Exit, Debug}
 
 class MyException(msg: String) extends Exception(msg) {
   override def fillInStackTrace() = this
 }
 
-object Test { 
-
   case object StartError extends Actor { 
     def act() { 
       try {
diff --git a/test/files/jvm/annotations.scala b/test/files/jvm/annotations.scala
index 77a45fae89..c42eceef4c 100644
--- a/test/files/jvm/annotations.scala
+++ b/test/files/jvm/annotations.scala
@@ -1,3 +1,6 @@
+
+import scala.language.{ higherKinds, reflectiveCalls }
+
 object Test1 {
   class Foo {
     @remote
diff --git a/test/files/jvm/daemon-actor-termination.scala b/test/files/jvm/daemon-actor-termination.scala
index 6ddfc3139d..40acd8583e 100644
--- a/test/files/jvm/daemon-actor-termination.scala
+++ b/test/files/jvm/daemon-actor-termination.scala
@@ -1,8 +1,10 @@
-import scala.actors.{Actor, DaemonActor}
 
 /* Test that a daemon Actor that hasn't finished does not prevent termination */
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
 
+  import scala.actors.{Actor, DaemonActor}
   class MyDaemon extends DaemonActor {
     def act() {
       try {
diff --git a/test/files/jvm/deprecation.check b/test/files/jvm/deprecation.check
new file mode 100644
index 0000000000..e263e4909d
--- /dev/null
+++ b/test/files/jvm/deprecation.check
@@ -0,0 +1,3 @@
+warning: there were 5 deprecation warning(s); re-run with -deprecation for details
+Note: deprecation/Use_2.java uses or overrides a deprecated API.
+Note: Recompile with -Xlint:deprecation for details.
diff --git a/test/files/jvm/duration-tck.scala b/test/files/jvm/duration-tck.scala
index b2573448c7..3bc8a2c100 100644
--- a/test/files/jvm/duration-tck.scala
+++ b/test/files/jvm/duration-tck.scala
@@ -6,6 +6,8 @@ import scala.concurrent.duration._
 import scala.reflect._
 import scala.tools.partest.TestUtil.intercept
 
+import scala.language.{ postfixOps }
+
 object Test extends App {
 
   implicit class Assert(val left: Any) extends AnyVal {
diff --git a/test/files/jvm/future-alarm.scala b/test/files/jvm/future-alarm.scala
index 8ee902b5ea..3e71fa681c 100644
--- a/test/files/jvm/future-alarm.scala
+++ b/test/files/jvm/future-alarm.scala
@@ -1,6 +1,8 @@
-import scala.actors.Futures
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Futures
   def main(args: Array[String]) {
     try {
     for (i <- 1 to 100000) {
diff --git a/test/files/jvm/future-awaitall-zero.scala b/test/files/jvm/future-awaitall-zero.scala
index cd6ba172cc..56f4bab16f 100644
--- a/test/files/jvm/future-awaitall-zero.scala
+++ b/test/files/jvm/future-awaitall-zero.scala
@@ -1,7 +1,9 @@
-import scala.actors.Futures._
-import scala.actors.Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Futures._
+  import scala.actors.Actor._
   def main(args: Array[String]) {
     try {
     val ft1 = future { reactWithin(10000) {
diff --git a/test/files/jvm/future-spec/main.scala b/test/files/jvm/future-spec/main.scala
index 90048ccda0..e000431dda 100644
--- a/test/files/jvm/future-spec/main.scala
+++ b/test/files/jvm/future-spec/main.scala
@@ -17,6 +17,12 @@ object Test {
   
 }
 
+trait Features {
+  implicit def implicitously = scala.language.implicitConversions
+  implicit def reflectively  = scala.language.reflectiveCalls
+  implicit def postulously   = scala.language.postfixOps
+}
+
 
 trait Output {
   val buffer = new StringBuilder
@@ -27,7 +33,7 @@ trait Output {
 }
 
 
-trait MinimalScalaTest extends Output {
+trait MinimalScalaTest extends Output with Features {
   
   val throwables = mutable.ArrayBuffer[Throwable]()
   
@@ -70,7 +76,7 @@ trait MinimalScalaTest extends Output {
       throw new Exception("Exception of type %s was not thrown".format(manifest[T]))
     } catch {
       case t: Throwable =>
-        if (manifest[T].erasure != t.getClass) throw t
+        if (manifest[T].runtimeClass != t.getClass) throw t
         else t.asInstanceOf[T]
     }
   }
diff --git a/test/files/jvm/future-termination.scala b/test/files/jvm/future-termination.scala
index f51642cb7a..668b3f74ba 100644
--- a/test/files/jvm/future-termination.scala
+++ b/test/files/jvm/future-termination.scala
@@ -1,8 +1,10 @@
-import scala.actors.Futures 
  
 /* Test that unevaluated futures do not prevent program termination */ 
  
+
+@deprecated("Suppress warnings", since="2.11")
 object Test { 
+  import scala.actors.Futures 
   def main(args: Array[String]) { 
     try {
     val meaningOfLife = Futures.future { 
diff --git a/test/files/jvm/reactor-exceptionOnSend.scala b/test/files/jvm/reactor-exceptionOnSend.scala
index 3d9a042131..6d79fc9d13 100644
--- a/test/files/jvm/reactor-exceptionOnSend.scala
+++ b/test/files/jvm/reactor-exceptionOnSend.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.Reactor
 import scala.actors.Actor._
 
@@ -48,7 +52,6 @@ object B extends Reactor[Any] {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     B.start()
   }
diff --git a/test/files/jvm/reactor-producer-consumer.scala b/test/files/jvm/reactor-producer-consumer.scala
index 8a6b17c3ad..ec34febe01 100644
--- a/test/files/jvm/reactor-producer-consumer.scala
+++ b/test/files/jvm/reactor-producer-consumer.scala
@@ -1,6 +1,8 @@
-import scala.actors.Reactor
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Reactor
   case class Stop()
   case class Get(from: Reactor[Any])
   case class Put(x: Int)
diff --git a/test/files/jvm/reactor.scala b/test/files/jvm/reactor.scala
index dbc9a6bdda..91ded27f07 100644
--- a/test/files/jvm/reactor.scala
+++ b/test/files/jvm/reactor.scala
@@ -1,3 +1,11 @@
+/**
+ * Ping pong example for Reactor.
+ *
+ * @author  Philipp Haller
+ */
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 
 import scala.actors.Reactor
 
@@ -5,19 +13,12 @@ case class Ping(from: Reactor[Any])
 case object Pong
 case object Stop
 
-/**
- * Ping pong example for Reactor.
- *
- * @author  Philipp Haller
- */
-object Test {
   def main(args: Array[String]) {
     val pong = new PongActor
     val ping = new PingActor(100000, pong)
     ping.start
     pong.start
   }
-}
 
 class PingActor(count: Int, pong: Reactor[Any]) extends Reactor[Any] {
   def act() {
@@ -68,3 +69,4 @@ class PongActor extends Reactor[Any] {
     }
   }
 }
+}
diff --git a/test/files/jvm/replyablereactor.scala b/test/files/jvm/replyablereactor.scala
index e1fabc98da..4c4e13d9ab 100644
--- a/test/files/jvm/replyablereactor.scala
+++ b/test/files/jvm/replyablereactor.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.ReplyReactor
 
 class MyActor extends ReplyReactor {
@@ -18,7 +22,6 @@ class MyActor extends ReplyReactor {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     val a = new MyActor
     a.start()
diff --git a/test/files/jvm/replyablereactor2.scala b/test/files/jvm/replyablereactor2.scala
index da9e0e269e..21f33cce56 100644
--- a/test/files/jvm/replyablereactor2.scala
+++ b/test/files/jvm/replyablereactor2.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors._
 import scala.actors.Actor._
 
@@ -19,7 +23,6 @@ class MyActor extends ReplyReactor {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     val a = new MyActor
     a.start()
diff --git a/test/files/jvm/replyablereactor3.scala b/test/files/jvm/replyablereactor3.scala
index 2c26b8a176..5810ed053f 100644
--- a/test/files/jvm/replyablereactor3.scala
+++ b/test/files/jvm/replyablereactor3.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors._
 import scala.actors.Actor._
 
@@ -19,7 +23,6 @@ class MyActor extends ReplyReactor {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     val a = new MyActor
     a.start()
diff --git a/test/files/jvm/replyablereactor4.scala b/test/files/jvm/replyablereactor4.scala
index 8776cf63f0..95d63684dd 100644
--- a/test/files/jvm/replyablereactor4.scala
+++ b/test/files/jvm/replyablereactor4.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors._
 import scala.actors.Actor._
 
@@ -19,7 +23,6 @@ class MyActor extends ReplyReactor {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     val a = new MyActor
     a.start()
diff --git a/test/files/jvm/replyreactor-react-sender.scala b/test/files/jvm/replyreactor-react-sender.scala
index c9884295f6..fdcea09035 100644
--- a/test/files/jvm/replyreactor-react-sender.scala
+++ b/test/files/jvm/replyreactor-react-sender.scala
@@ -1,7 +1,9 @@
-import scala.actors.ReplyReactor
-import scala.actors.Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.ReplyReactor
+  import scala.actors.Actor._
 
   val NUM = 2000
 
diff --git a/test/files/jvm/replyreactor.scala b/test/files/jvm/replyreactor.scala
index 0cecf29ec7..7512fb0eb2 100644
--- a/test/files/jvm/replyreactor.scala
+++ b/test/files/jvm/replyreactor.scala
@@ -1,6 +1,8 @@
-import scala.actors.ReplyReactor
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.ReplyReactor
   def main(args: Array[String]) {
     val a = new ReplyReactor {
       def act() {
diff --git a/test/files/jvm/scala-concurrent-tck.check b/test/files/jvm/scala-concurrent-tck.check
new file mode 100644
index 0000000000..18fc456acb
--- /dev/null
+++ b/test/files/jvm/scala-concurrent-tck.check
@@ -0,0 +1,3 @@
+scala-concurrent-tck.scala:429: warning: a pure expression does nothing in statement position; you may be omitting necessary parentheses
+    f
+    ^
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index b2b4183564..438ee310e6 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -728,7 +728,7 @@ trait Blocking extends TestBase {
       Await.result(f, Duration(500, "ms"))
       assert(false)
     } catch {
-      case t =>
+      case t: Throwable =>
         assert(t == cause)
         done()
     }
diff --git a/test/files/jvm/scheduler-adapter.scala b/test/files/jvm/scheduler-adapter.scala
index d6a8a446a0..1c9cfe7019 100644
--- a/test/files/jvm/scheduler-adapter.scala
+++ b/test/files/jvm/scheduler-adapter.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, SchedulerAdapter}
 
 trait AdaptedActor extends Actor {
@@ -36,7 +40,6 @@ object Two extends AdaptedActor {
   }
 }
 
-object Test {
   val adapted =
     new SchedulerAdapter {
       def execute(block: => Unit) {
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index f2c47aad77..a64b7115fa 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -281,6 +281,7 @@ object Test2_immutable {
 //############################################################################
 // Test classes in package "scala.collection.mutable"
 
+@deprecated("Suppress warnings", since="2.11")
 object Test3_mutable {
   import scala.reflect.ClassManifest
   import scala.collection.mutable.{
@@ -593,6 +594,7 @@ object Test8 {
 //############################################################################
 // Test code
 
+@deprecated("Suppress warnings", since="2.11")
 object Test {
   def main(args: Array[String]) {
     Test1_scala
@@ -678,7 +680,7 @@ object Test10_util {
   import scala.util.Random
   def rep[A](n: Int)(f: => A) { if (n > 0) { f; rep(n-1)(f) } }
 
-  try {
+  {
     val random = new Random(345)
     val random2: Random = read(write(random))
     rep(5) { assert(random.nextInt == random2.nextInt) }
diff --git a/test/files/jvm/stringbuilder.scala b/test/files/jvm/stringbuilder.scala
index 54951d657b..1fbf61aeab 100644
--- a/test/files/jvm/stringbuilder.scala
+++ b/test/files/jvm/stringbuilder.scala
@@ -2,6 +2,7 @@
  *
  *  @author Stephane Micheloud
  */
+import scala.language.{ postfixOps }
 object Test {
   def main(args: Array[String]) {
     Test1.run() //ctor, reverse
diff --git a/test/files/jvm/t1449.scala b/test/files/jvm/t1449.scala
index 3822cf7dd5..7917d6f6d5 100644
--- a/test/files/jvm/t1449.scala
+++ b/test/files/jvm/t1449.scala
@@ -1,7 +1,10 @@
-import scala.actors.Actor._
-import scala.actors.Future
-import scala.actors.Futures._
+
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Actor._
+  import scala.actors.Future
+  import scala.actors.Futures._
   def main(args: Array[String]) {
     val a = actor {
       try {
diff --git a/test/files/jvm/t1948.scala b/test/files/jvm/t1948.scala
index 084c956398..95777b8037 100644
--- a/test/files/jvm/t1948.scala
+++ b/test/files/jvm/t1948.scala
@@ -1,7 +1,9 @@
-import scala.actors._
-import scala.actors.Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors._
+  import scala.actors.Actor._
 
   def main (args: Array[String]) {
     val actors = (1 to 1000).toList map { x => actor {
diff --git a/test/files/jvm/t2163/t2163.scala b/test/files/jvm/t2163/t2163.scala
index f73b520cbe..fdf19c4e25 100644
--- a/test/files/jvm/t2163/t2163.scala
+++ b/test/files/jvm/t2163/t2163.scala
@@ -1,5 +1,10 @@
+
+import scala.language.{ higherKinds }
+
 class T2163Scala[CC[X]](x: CC[Int]) {
   def bar[DD[X]](meh: DD[Int]): CC[Int] = x
 }
 
-object Test extends App {}
+object Test extends App {
+  new t2163().test()
+}
diff --git a/test/files/jvm/t2359.scala b/test/files/jvm/t2359.scala
index 69c69d7b3b..76b78d44f7 100644
--- a/test/files/jvm/t2359.scala
+++ b/test/files/jvm/t2359.scala
@@ -1,6 +1,8 @@
-import scala.actors.Futures._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Futures._
   def main(args: Array[String]) {
     val x = future {
       try {
diff --git a/test/files/jvm/t2530.scala b/test/files/jvm/t2530.scala
index c2925a92d1..b41661e623 100644
--- a/test/files/jvm/t2530.scala
+++ b/test/files/jvm/t2530.scala
@@ -1,6 +1,8 @@
-import scala.actors.{Future, Futures}
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.{Future, Futures}
 
   def main(args:Array[String]) : Unit = {
     //scala.actors.Debug.level = 3
@@ -29,7 +31,6 @@ object Test {
     }
     println("Test done with no deadlock. Try again, it will not occur...")
   }
-}
 
 case class Matrix(numRows: Int, numCols: Int, values: Array[Double])  {
 
@@ -94,3 +95,4 @@ case class Matrix(numRows: Int, numCols: Int, values: Array[Double])  {
   }
 
 }
+}
diff --git a/test/files/jvm/t3102.scala b/test/files/jvm/t3102.scala
index fbcf2e60e6..d0e0704859 100644
--- a/test/files/jvm/t3102.scala
+++ b/test/files/jvm/t3102.scala
@@ -1,7 +1,10 @@
-import scala.actors.{Actor, TIMEOUT}
-import Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.{Actor, TIMEOUT}
+  import Actor._
+
   def main(args: Array[String]) {
     val a = actor {
       try {
diff --git a/test/files/jvm/t3356.scala b/test/files/jvm/t3356.scala
index a9e83fe503..53bfd737cd 100644
--- a/test/files/jvm/t3356.scala
+++ b/test/files/jvm/t3356.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{Actor, Exit, !, UncaughtException}
 import Actor._
 
@@ -10,7 +14,6 @@ case class ImageInfo(text: String) {
 case class ImageData(text: String)
 case class Download(info: ImageInfo)
 
-object Test {
 
   def scanForImageInfo(url: String): List[ImageInfo] =
     List(ImageInfo("A"), ImageInfo("B"))
diff --git a/test/files/jvm/t3365.scala b/test/files/jvm/t3365.scala
index b94e804e63..8321428093 100644
--- a/test/files/jvm/t3365.scala
+++ b/test/files/jvm/t3365.scala
@@ -1,3 +1,7 @@
+
+
+@deprecated("Suppress warnings", since="2.11")
+object Test {
 import scala.actors.{ReplyReactor, Channel, Actor, Future}
 
 case class ChannelMsg(chan: Channel[Any])
@@ -27,7 +31,6 @@ class MyActor extends Actor {
   }
 }
 
-object Test {
   def main(args: Array[String]) {
     val a = new MyActor
     a.start()
diff --git a/test/files/jvm/t3407.scala b/test/files/jvm/t3407.scala
index 6c2ce85c71..757fa3a438 100644
--- a/test/files/jvm/t3407.scala
+++ b/test/files/jvm/t3407.scala
@@ -1,6 +1,8 @@
-import scala.actors._, scala.actors.Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors._, scala.actors.Actor._
 
   def main(args: Array[String]) {
     for (i <- 1 to 10) {
diff --git a/test/files/jvm/t3412-channel.scala b/test/files/jvm/t3412-channel.scala
index fcc439b488..af319d2303 100644
--- a/test/files/jvm/t3412-channel.scala
+++ b/test/files/jvm/t3412-channel.scala
@@ -1,6 +1,8 @@
-import scala.actors._, scala.actors.Actor._, scala.actors.Futures._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors._, scala.actors.Actor._, scala.actors.Futures._
 
   def main(args: Array[String]) {
 
diff --git a/test/files/jvm/t3412.scala b/test/files/jvm/t3412.scala
index ced15ab5dc..fde6c04cb7 100644
--- a/test/files/jvm/t3412.scala
+++ b/test/files/jvm/t3412.scala
@@ -1,6 +1,8 @@
-import scala.actors._, scala.actors.Actor._, scala.actors.Futures._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors._, scala.actors.Actor._, scala.actors.Futures._
 
   def main(args: Array[String]) {
 
diff --git a/test/files/jvm/t3470.scala b/test/files/jvm/t3470.scala
index 5e4242cdd7..bcb1d4f8de 100644
--- a/test/files/jvm/t3470.scala
+++ b/test/files/jvm/t3470.scala
@@ -1,6 +1,8 @@
-import scala.actors._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors._
 
   def expectActorState(a: Reactor[T] forSome { type T }, s: Actor.State.Value) {
     var done = false
diff --git a/test/files/jvm/t3838.scala b/test/files/jvm/t3838.scala
index ba8f15fc31..a1a71d1049 100644
--- a/test/files/jvm/t3838.scala
+++ b/test/files/jvm/t3838.scala
@@ -1,6 +1,8 @@
-import scala.actors.Actor._
 
+
+@deprecated("Suppress warnings", since="2.11")
 object Test {
+  import scala.actors.Actor._
   def main(args: Array[String]) {
     actor {
       try {
diff --git a/test/files/jvm/t560bis.scala b/test/files/jvm/t560bis.scala
index b04303c8a0..21eb8dde28 100644
--- a/test/files/jvm/t560bis.scala
+++ b/test/files/jvm/t560bis.scala
@@ -6,7 +6,7 @@ import scala.xml._;
     case _ => Console.println("bah")
   }
   def foo(args: List[String]) = 
-    Elem(null,"bla",Null, TopScope, (args map {x => Text(x)}):_*) match {
+    Elem(null,"bla",Null, TopScope, minimizeEmpty = true, (args map {x => Text(x)}):_*) match {
       case Elem(_,_,_,_,Text("1"),_*) =>
         Console.println("cool!")
       case _ =>
diff --git a/test/files/jvm/t6941/Analyzed_1.flags b/test/files/jvm/t6941/Analyzed_1.flags
new file mode 100644
index 0000000000..ad51758c39
--- /dev/null
+++ b/test/files/jvm/t6941/Analyzed_1.flags
@@ -0,0 +1 @@
+-nowarn
diff --git a/test/files/jvm/t7006.check b/test/files/jvm/t7006.check
new file mode 100644
index 0000000000..7c99eba30c
--- /dev/null
+++ b/test/files/jvm/t7006.check
@@ -0,0 +1,28 @@
+[running phase parser on Foo_1.scala]
+[running phase namer on Foo_1.scala]
+[running phase packageobjects on Foo_1.scala]
+[running phase typer on Foo_1.scala]
+[running phase patmat on Foo_1.scala]
+[running phase superaccessors on Foo_1.scala]
+[running phase extmethods on Foo_1.scala]
+[running phase pickler on Foo_1.scala]
+[running phase refchecks on Foo_1.scala]
+[running phase uncurry on Foo_1.scala]
+[running phase tailcalls on Foo_1.scala]
+[running phase specialize on Foo_1.scala]
+[running phase explicitouter on Foo_1.scala]
+[running phase erasure on Foo_1.scala]
+[running phase posterasure on Foo_1.scala]
+[running phase lazyvals on Foo_1.scala]
+[running phase lambdalift on Foo_1.scala]
+[running phase constructors on Foo_1.scala]
+[running phase flatten on Foo_1.scala]
+[running phase mixin on Foo_1.scala]
+[running phase cleanup on Foo_1.scala]
+[running phase icode on Foo_1.scala]
+[running phase inliner on Foo_1.scala]
+[running phase inlinehandlers on Foo_1.scala]
+[running phase closelim on Foo_1.scala]
+[running phase constopt on Foo_1.scala]
+[running phase dce on Foo_1.scala]
+[running phase jvm on icode]
diff --git a/test/files/jvm/t7146.scala b/test/files/jvm/t7146.scala
index 2bd03d6d02..aaa3dc7ca4 100644
--- a/test/files/jvm/t7146.scala
+++ b/test/files/jvm/t7146.scala
@@ -1,3 +1,5 @@
+
+import scala.language.{ reflectiveCalls }
 import java.util.concurrent.Executor
 import scala.concurrent._
 import scala.util.control.NoStackTrace
diff --git a/test/files/jvm/try-type-tests.scala b/test/files/jvm/try-type-tests.scala
index 17811f64c5..e5e53ee737 100644
--- a/test/files/jvm/try-type-tests.scala
+++ b/test/files/jvm/try-type-tests.scala
@@ -49,6 +49,7 @@ trait TryStandard {
 		n match {
 			case Success(v) => assert(false)
 			case Failure(e: NoSuchElementException) => assert(true)
+      case _          => assert(false)
 		}
 	}
 
@@ -141,4 +142,4 @@ object Test
 extends App
 with TryStandard {
   System.exit(0)
-}
\ No newline at end of file
+}
diff --git a/test/files/jvm/unreachable/Foo_1.scala b/test/files/jvm/unreachable/Foo_1.scala
index d17421c516..c223718097 100644
--- a/test/files/jvm/unreachable/Foo_1.scala
+++ b/test/files/jvm/unreachable/Foo_1.scala
@@ -1,3 +1,5 @@
+import scala.sys.error
+
 class Foo_1 {
   def unreachableNormalExit: Int = {
     return 42
@@ -107,4 +109,4 @@ class Foo_1 {
     }
     2
   }
-}
\ No newline at end of file
+}
diff --git a/test/files/jvm/xml01.scala b/test/files/jvm/xml01.scala
index 75777a5b94..2b456f5ff5 100644
--- a/test/files/jvm/xml01.scala
+++ b/test/files/jvm/xml01.scala
@@ -4,6 +4,8 @@ import org.xml.sax.InputSource
 import scala.xml._
 
 object Test extends App {
+  def Elem(prefix: String, label: String, attributes: MetaData, scope: NamespaceBinding, child: Node*): Elem =
+    scala.xml.Elem.apply(prefix, label, attributes, scope, minimizeEmpty = true, child: _*)
   val e:  scala.xml.MetaData         = Null  //Node.NoAttributes
   val sc: scala.xml.NamespaceBinding = TopScope
 
diff --git a/test/files/jvm/xml03syntax.check b/test/files/jvm/xml03syntax.check
index edcdbdd2ba..599cbad686 100755
--- a/test/files/jvm/xml03syntax.check
+++ b/test/files/jvm/xml03syntax.check
@@ -24,3 +24,4 @@ true
 
 node=<elem key="<b>hello</b>"/>, key=Some(<b>hello</b>)
 node=<elem/>, key=None
+<a>Š</a>
diff --git a/test/files/jvm/xml03syntax.scala b/test/files/jvm/xml03syntax.scala
index 2c93f7c176..41663681c7 100644
--- a/test/files/jvm/xml03syntax.scala
+++ b/test/files/jvm/xml03syntax.scala
@@ -91,7 +91,7 @@ object Test {
     }
     val parsed = parser.element(TopScope) // parse the source as element
     // alternatively, we could call document()
-    parsed
+    println(parsed)
   }
 
 }