Some fixes for partest issues.

prejudice and puts the new process code to work instead. There are still
a couple bugs on my short term partest list. If this commit causes some
weird issue which only arises on virtualized windows you can expect to
hear from me next by postcard from st. lucia. No review.

3 files changed, 5 insertions, 6 deletions

diff --git a/test/files/jvm/actor-link-getstate.scala b/test/files/jvm/actor-link-getstate.scala
index c4c33ef752..c24daf2eff 100644
--- a/test/files/jvm/actor-link-getstate.scala
+++ b/test/files/jvm/actor-link-getstate.scala
@@ -11,7 +11,7 @@ object Slave extends Actor {
     loop {
       react {
         case 'doWork =>
-          Console.err.println("Done")
+          Console.out.println("Done")
           reply('done)
       }
     }
@@ -50,7 +50,7 @@ object Test {
       Master.start()
       react {
         case Exit(from, reason) if (from == Slave) =>
-          Console.err.println(Slave.getState)
+          Console.out.println(Slave.getState)
       }
       } catch {
         case e: Throwable if !e.isInstanceOf[scala.util.control.ControlThrowable] =>
diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check
index ee9520d1ea..a905c3fbf0 100644
--- a/test/files/res/bug687.check
+++ b/test/files/res/bug687.check
@@ -6,6 +6,3 @@ method equals:(x$1: Any)Boolean in class Any
 have same type after erasure: (o: java.lang.Object)Boolean
   override def equals(o : Object) = false;
                ^
-
-nsc> 
-nsc> 
diff --git a/test/files/run/programmatic-main.scala b/test/files/run/programmatic-main.scala
index 9c7d0b7095..3a88252fd3 100644
--- a/test/files/run/programmatic-main.scala
+++ b/test/files/run/programmatic-main.scala
@@ -7,6 +7,8 @@ object Test {
   val baseargs = Array("-usejavacp", "-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar")
 
   def main(args: Array[String]): Unit = {
-    Main process (baseargs ++ Array("-Xshow-phases"))
+    Console.withErr(Console.out) {
+      Main process (baseargs ++ Array("-Xshow-phases"))
+    }
   }
 }