broken tests -- for check file diffing ease

Author: adriaanm

test/files/neg/anytrait.check

@@ -1,7 +1,4 @@
-anytrait.scala:3: error: field definition is not allowed in universal trait extending from class Any
-  var x = 1
-      ^
 anytrait.scala:5: error: this statement is not allowed in universal trait extending from class Any
   { x += 1 }
       ^
-two errors found
+one error found

test/files/neg/delayed-init-ref.check

@@ -8,9 +8,6 @@ delayed-init-ref.scala:28: warning: trait DelayedInit in package scala is deprec
 See the release notes for more details: https://github.com/scala/scala/releases/tag/v2.11.0-RC1
 trait Before extends DelayedInit {
                      ^
-delayed-init-ref.scala:40: warning: Selecting value foo from trait UserContext, which extends scala.DelayedInit, is likely to yield an uninitialized value
-    println({locally(()); this}.foo)  // warn (spurious, but we can't discriminate)
-                                ^
 error: No warnings can be incurred under -Xfatal-warnings.
-four warnings found
+three warnings found
 one error found

test/files/neg/t1960.check

@@ -1,4 +1,5 @@
-t1960.scala:5: error: parameter 'p' requires field but conflicts with method p in trait TBase
+t1960.scala:5: error: class Aclass needs to be abstract, since variable p in trait TBase of type Int is not defined
+(Note that variables need to be initialized to be defined)
 class Aclass (p: Int) extends TBase { def g() { f(p) } }
-              ^
+      ^
 one error found

test/files/neg/t562.check

@@ -1,4 +1,4 @@
-t562.scala:10: error: super may not be used on value y
+t562.scala:10: error: super may not be used on <none>
   override val y = super.y;
                          ^
 one error found

test/files/neg/t6276.check

@@ -1,9 +1,6 @@
 t6276.scala:4: warning: method a in class C does nothing other than call itself recursively
       def a: Any = a // warn
                    ^
-t6276.scala:5: warning: value b in class C does nothing other than call itself recursively
-      val b: Any = b // warn
-                   ^
 t6276.scala:7: warning: method c in class C does nothing other than call itself recursively
       def c: Any = this.c // warn
                         ^
@@ -17,5 +14,5 @@ t6276.scala:22: warning: method a does nothing other than call itself recursivel
       def a = a // warn
               ^
 error: No warnings can be incurred under -Xfatal-warnings.
-6 warnings found
+5 warnings found
 one error found

test/files/run/bugs.check

@@ -91,6 +91,8 @@ C
 >>> bug 396
 
 <<< bug 399
-a
+Exception in thread "Thread[main,5,main]" java.lang.AbstractMethodError: Bug399Test$G$1.Bug399Test$C$1$_setter_$x$1_$eq(Ljava/lang/String;)V
 >>> bug 399
 
+
+1 error

test/files/run/t6733.check

@@ -1,21 +1,20 @@
 method $init$: isPrivateThis = false, isProtectedThis = false
 value pri1a: isPrivateThis = true, isProtectedThis = false
 method pri2a: isPrivateThis = true, isProtectedThis = false
-variable pri3a: isPrivateThis = true, isProtectedThis = false
+method pri3a: isPrivateThis = true, isProtectedThis = false
+method pri3a_=: isPrivateThis = true, isProtectedThis = false
 value pri4a: isPrivateThis = true, isProtectedThis = false
 lazy value pri4a: isPrivateThis = true, isProtectedThis = false
 type Pri5a: isPrivateThis = true, isProtectedThis = false
 class Pri6: isPrivateThis = true, isProtectedThis = false
 trait Pri7: isPrivateThis = true, isProtectedThis = false
 object Pri8: isPrivateThis = true, isProtectedThis = false
 value pro1a: isPrivateThis = false, isProtectedThis = true
-value pro1a: isPrivateThis = true, isProtectedThis = false
 value pro1b: isPrivateThis = false, isProtectedThis = true
 method pro2a: isPrivateThis = false, isProtectedThis = true
 method pro2b: isPrivateThis = false, isProtectedThis = true
 method pro3a: isPrivateThis = false, isProtectedThis = true
 method pro3a_=: isPrivateThis = false, isProtectedThis = true
-variable pro3a: isPrivateThis = true, isProtectedThis = false
 method pro3b: isPrivateThis = false, isProtectedThis = true
 method pro3b_=: isPrivateThis = false, isProtectedThis = true
 value pro4a: isPrivateThis = false, isProtectedThis = true
@@ -25,3 +24,5 @@ type Pro5b: isPrivateThis = false, isProtectedThis = true
 class Pro6: isPrivateThis = false, isProtectedThis = true
 trait Pro7: isPrivateThis = false, isProtectedThis = true
 object Pro8: isPrivateThis = false, isProtectedThis = true
+method pri1a_=: isPrivateThis = false, isProtectedThis = false
+method Foo$_setter_$pro1a_=: isPrivateThis = false, isProtectedThis = false

test/files/run/t7533.check

@@ -13,12 +13,12 @@ type T2 => false
 trait T => true
 method $init$ => false
 value z1 => true
-value z2 => false
-value z2 => false
+value z2 => true
 method w1 => true
 method w2 => false
 type U1 => true
 type U2 => false
+method T$_setter_$z2_= => true
 =======class D=======
 class D => false
 constructor D => false