Merge libv1.

tests/language/language.status

Index: tests/language/language.status
diff --git a/tests/language/language.status b/tests/language/language.status
index 84e2db29049fb16c088628fd36a834f882b8c619..aa20e9f5f002281976edcf162c60a137c5854d31 100644
--- a/tests/language/language.status
+++ b/tests/language/language.status
@@ -19,9 +19,6 @@
 part_test: Fail
 part2_test: Fail
 gc_test: Fail # Issue 1487
-field_override_test/none: Fail  # Issue 742: field shadowing now allowed
-field_override_test/01: Fail    # Issue 742: field shadowing now allowed
-super_field_access_test: Fail    # Issue 742: field shadowing now allowed
 pseudo_kw_illegal_test/14: Fail  # Issue 356
 
 # These bugs refer currently ongoing language discussions.
@@ -39,9 +36,6 @@ call_operator_test: Fail
 
 parameter_initializer6_negative_test: Fail # Issue 3502
 
-bad_override_test/01: Fail # Issue 3859.
-bad_override_test/02: Fail # Issue 3859.
-
 named_parameters_aggregated_test/05: Fail # Compile-time error reported instead of static type warning.
 
 lazy_static3_test: Fail # Issue 3558
@@ -68,8 +62,13 @@ gc_test: Skip  # Issue 1487, flaky.
 [ $compiler == none && $mode == debug ]
 gc_test: Skip  # Takes too long.
 
+
+[ $compiler == none && $checked ]
+redirecting_factory_infinite_steps_test/01: Fail # http://dartbug.com/6596
+
+
 [ $compiler == none && $unchecked ]
-field_override_test/02: Fail    # Issue 742: field shadowing now allowed
+
 
 # Only checked mode reports an error on type assignment
 # problems in compile time constants.
@@ -88,8 +87,12 @@ compile_time_constant_checked3_test/05: Fail, OK
 compile_time_constant_checked3_test/06: Fail, OK
 
 [ $compiler == dartc ]
+redirecting_factory_infinite_steps_test/01: Fail # http://dartbug.com/6560
+redirecting_factory_infinite_steps_test/02: Fail # http://dartbug.com/6560
 implicit_this_test/none: Fail # should not warn about allocating SubAbstract2
 metadata_test: Fail
+bad_override_test/01: Fail
+bad_override_test/02: Fail
 get_set_syntax_test/none: Fail # does not accept getter/setter with no method body
 application_negative_test: Fail # Runtime only test, rewrite as multitest
 assign_instance_method_negative_test: Fail # Runtime only test, rewrite as multitest
@@ -138,8 +141,7 @@ constructor_call_wrong_argument_count_negative_test: Fail # Runtime only test, r
 disable_privacy_test: Fail # Issue 1882: Needs --disable_privacy support.
 factory5_test/00: Fail # issue 3079
 field_method4_negative_test: Fail  # Runtime only test, rewrite as multitest
-field7_negative_test: Fail, OK # language changed, test issue 5249
-field7a_negative_test: Fail, OK # language changed, test issue 5249
+
 first_class_types_literals_test: Fail # issue 6283
 getter_no_setter_test/01: Fail # Fails to detect compile-time error.
 getter_no_setter2_test/01: Fail # Fails to detect compile-time error.
@@ -157,8 +159,6 @@ named_parameters_with_object_property_names_test: Fail # Issue 2137
 many_overridden_no_such_method_test: Fail
 no_such_method_negative_test: Fail # Runtime only test, rewrite as multitest
 override_field_test/03: Fail # still a valid test? Issue 3894
-override_field_test/04: Fail # still a valid test? Issue 3656
-override_field_method3_negative_test: Fail, OK # test issue 5249
 override_field_method6_negative_test: Fail, OK # test issue 5249
 overridden_no_such_method_test: Fail
 parameter_initializer6_negative_test: Fail # language change 4288
@@ -384,12 +384,17 @@ string_escape1_negative_test: Skip
 *: Skip
 
 [ $compiler == dart2dart ]
+redirecting_factory_infinite_steps_test/01: Fail, Pass # TRIAGE: fails in minified mode. http://dartbug.com/6603
+
 many_overridden_no_such_method_test: Fail, Pass # TRIAGE: fails in minified mode
 overridden_no_such_method_test: Fail, Pass # TRIAGE: fails in minified mode
 # Calling unresolved class constructor:
 # call_constructor_on_unresolvable_class_test/07: Fail
 call_nonexistent_constructor_test: Fail
 
+bad_override_test/01: Fail
+bad_override_test/02: Fail
+
 illegal_invocation_test/01: Fail, OK # Typedef literals are expressions now.
 illegal_invocation_test/04: Fail, OK # Class literals are expressions now.
 illegal_invocation_test/05: Fail, OK # Type variables are expressions now.
@@ -457,7 +462,6 @@ named_parameters_aggregated_test/01: Fail # http://dartbug.com/5519
 named_parameters_aggregated_test/03: Fail # http://dartbug.com/5519
 named_parameters_aggregated_test/04: Fail # http://dartbug.com/5519
 not_enough_positional_arguments_test/01: Fail # http://dartbug.com/5519
-override_field_test/04: Fail # http://dartbug.com/5519
 static_field3_test/01: Fail # http://dartbug.com/5519
 static_field3_test/02: Fail # http://dartbug.com/5519
 static_field3_test/03: Fail # http://dartbug.com/5519
@@ -477,7 +481,6 @@ map_literal3_test: Fail # Map literals take 2 type arguments.
 class_cycle_negative_test: Fail, OK # Bad test: assumes eager loading.
 field1_negative_test: Fail, OK # Bad test: assumes eager loading.
 field6_negative_test: Fail, OK # Bad test: assumes eager loading.
-field7_negative_test: Fail, OK # Bad test: assumes eager loading.
 interface_cycle_negative_test: Fail, OK # Bad test: assumes eager loading.
 # Common problems with dart2js.  In illegal family, invalid
 # declarations are simply not parsed.  In pseudo kw dart2js
@@ -501,7 +504,6 @@ field2_negative_test: Fail
 field4_negative_test: Fail
 field5_negative_test: Fail
 field6a_negative_test: Fail
-field7a_negative_test: Fail
 interface_factory_constructor_negative_test: Fail
 interface_static_method_negative_test: Fail
 non_const_super_negative_test: Fail
@@ -543,11 +545,7 @@ syntax_test/47: Fail
 constructor5_test: Fail
 constructor6_test: Fail
 closure_in_initializer_test: Fail
-field_override_test/01: Fail
-field_override_test/02: Fail
-field_override_test/none: Fail
 gc_test: Fail
-super_field_access_test: Fail
 super_first_constructor_test: Fail
 # VM specific tests.
 disable_privacy_test: Fail, Ok