8 files changed, 17 insertions, 45 deletions
diff --git a/test/files/disabled/A.scala b/test/files/disabled/A.scala
deleted file mode 100644
index c070faf978..0000000000
--- a/test/files/disabled/A.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-trait As {
-  trait C extends D {
-    override def foo = this  /// Shouldn't cause the change
-    override def foo(act: List[D]) = this
-  }
-
-  abstract class D{
-    def foo: D = this
-    def foo(act: List[D]) = this
-  }
-}
diff --git a/test/files/disabled/overloaded_1.check b/test/files/disabled/overloaded_1.check
deleted file mode 100644
index 4d643ce6b4..0000000000
--- a/test/files/disabled/overloaded_1.check
+++ /dev/null
@@ -1,6 +0,0 @@
-builder > A.scala
-compiling Set(A.scala)
-Changes: Map()
-builder > A.scala
-compiling Set(A.scala)
-Changes: Map(class As$D -> List(), object As$C$class -> List(), object As$class -> List(), trait As -> List(), trait As$C -> List())
diff --git a/test/files/disabled/overloaded_1.test b/test/files/disabled/overloaded_1.test
deleted file mode 100644
index 392e0d365f..0000000000
--- a/test/files/disabled/overloaded_1.test
+++ /dev/null
@@ -1,2 +0,0 @@
->>compile A.scala
->>compile A.scala
diff --git a/test/files/disabled/run/t4602.scala b/test/files/disabled/run/t4602.scala
index 73ba231ccf..655c350497 100644
--- a/test/files/disabled/run/t4602.scala
+++ b/test/files/disabled/run/t4602.scala
@@ -4,7 +4,7 @@ import java.util.concurrent.{CountDownLatch, TimeUnit}
 
 object Test extends App {
   val startupLatch = new CountDownLatch(1)
-  // we have to explicitly launch our server because when the client launches a server it uses 
+  // we have to explicitly launch our server because when the client launches a server it uses
   // the "scala" shell command meaning whatever version of scala (and whatever version of libraries)
   // happens to be in the path gets used
   val t = new Thread(new Runnable {
@@ -18,10 +18,10 @@ object Test extends App {
     sys error "Timeout waiting for server to start"
 
   val baos = new ByteArrayOutputStream()
-  val ps = new PrintStream(baos) 
+  val ps = new PrintStream(baos)
 
   val outdir = scala.reflect.io.Directory(sys.props("partest.output"))
-  
+
   val dirNameAndPath = (1 to 2).toList map {number =>
     val name = s"Hello${number}"
     val dir = outdir / number.toString
@@ -32,9 +32,9 @@ object Test extends App {
     dir.createDirectory()
     val file = path.jfile
     val out = new FileWriter(file)
-    try 
+    try
       out.write(s"object ${name}\n")
-    finally 
+    finally
       out.close
   }
 
@@ -50,7 +50,7 @@ object Test extends App {
   val msg = baos.toString()
 
   assert(success, s"got a failure. Full results were: \n${msg}")
-  dirNameAndPath foreach {case (_, _, path) => 
+  dirNameAndPath foreach {case (_, _, path) =>
     val expected = s"Input files after normalizing paths: ${path}"
     assert(msg contains expected, s"could not find '${expected}' in output. Full results were: \n${msg}")
   }
diff --git a/test/files/disabled/t4245/A.scala b/test/files/disabled/t4245/A.scala
deleted file mode 100644
index 7c4efe1b4b..0000000000
--- a/test/files/disabled/t4245/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-  class B(val a: Int)
-}
diff --git a/test/files/disabled/t4245/t4245.check b/test/files/disabled/t4245/t4245.check
deleted file mode 100644
index 3d3898c671..0000000000
--- a/test/files/disabled/t4245/t4245.check
+++ /dev/null
@@ -1,6 +0,0 @@
-builder > A.scala
-compiling Set(A.scala)
-Changes: Map()
-builder > A.scala
-compiling Set(A.scala)
-Changes: Map(class A -> List(), class A$B -> List())
diff --git a/test/files/disabled/t4245/t4245.test b/test/files/disabled/t4245/t4245.test
deleted file mode 100644
index 392e0d365f..0000000000
--- a/test/files/disabled/t4245/t4245.test
+++ /dev/null
@@ -1,2 +0,0 @@
->>compile A.scala
->>compile A.scala
diff --git a/test/files/disabled/t7020.check b/test/files/disabled/t7020.check
index a869b12363..f9600ca7fc 100644
--- a/test/files/disabled/t7020.check
+++ b/test/files/disabled/t7020.check
@@ -1,17 +1,19 @@
-t7020.scala:3: error: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List(_, _)
+t7020.scala:3: warning: match may not be exhaustive.
+It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
   List(5) match {
       ^
-t7020.scala:10: error: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List(_, _)
+t7020.scala:10: warning: match may not be exhaustive.
+It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
   List(5) match {
       ^
-t7020.scala:17: error: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List(_, _)
+t7020.scala:17: warning: match may not be exhaustive.
+It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
   List(5) match {
       ^
-t7020.scala:24: error: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List(_, _)
+t7020.scala:24: warning: match may not be exhaustive.
+It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
   List(5) match {
       ^
-four errors found
+error: No warnings can be incurred under -Xfatal-warnings.
+four warnings found
+one error found