[web] rename suite dart2js -> web.

Change-Id: I46be49b2effec3e38a3dc44cd45cfe736f77fa78
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/182680
Commit-Queue: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Joshua Litt <joshualitt@google.com>
Reviewed-by: Nicholas Shahan <nshahan@google.com>
Reviewed-by: Stephen Adams <sra@google.com>

.gitattributes

@@ -14,14 +14,14 @@
 *.yaml text
 
 # File that should not be converted.
-tests/dart2js/eof_line_ending_test.dart -text
-tests/dart2js/string_interpolation_test.dart -text
-tests/dart2js/string_interpolation_dynamic_test.dart -text
-tests/dart2js/literal_string_juxtaposition_test.dart -text
-tests/dart2js_2/eof_line_ending_test.dart -text
-tests/dart2js_2/string_interpolation_test.dart -text
-tests/dart2js_2/string_interpolation_dynamic_test.dart -text
-tests/dart2js_2/literal_string_juxtaposition_test.dart -text
+tests/web/eof_line_ending_test.dart -text
+tests/web/string_interpolation_test.dart -text
+tests/web/string_interpolation_dynamic_test.dart -text
+tests/web/literal_string_juxtaposition_test.dart -text
+tests/web_2/eof_line_ending_test.dart -text
+tests/web_2/string_interpolation_test.dart -text
+tests/web_2/string_interpolation_dynamic_test.dart -text
+tests/web_2/literal_string_juxtaposition_test.dart -text
 tests/language/string/raw_string_test.dart -text
 tests/language/string/multiline_strings_test.dart -text
 tests/language/string/multiline_newline_cr.dart -text

WATCHLISTS

@@ -28,7 +28,7 @@
       'filepath': (
         '^pkg/compiler|'
         '^sdk/lib/_internal/js_runtime|'
-        '^tests/dart2js'
+        '^tests/web'
       )
     },
     'dartdevc': {

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -53,12 +53,12 @@ class JsInteropChecks extends RecursiveVisitor<void> {
   /// Native tests to exclude from checks on external.
   // TODO(rileyporter): Use ExternalName from CFE to exclude native tests.
   List<Pattern> _allowedNativeTestPatterns = [
-    RegExp(r'(?<!generated_)tests/dart2js/native'),
-    RegExp(r'(?<!generated_)tests/dart2js/internal'),
-    'generated_tests/dart2js/native/native_test',
-    RegExp(r'(?<!generated_)tests/dart2js_2/native'),
-    RegExp(r'(?<!generated_)tests/dart2js_2/internal'),
-    'generated_tests/dart2js_2/native/native_test',
+    RegExp(r'(?<!generated_)tests/web/native'),
+    RegExp(r'(?<!generated_)tests/web/internal'),
+    'generated_tests/web/native/native_test',
+    RegExp(r'(?<!generated_)tests/web_2/native'),
+    RegExp(r'(?<!generated_)tests/web_2/internal'),
+    'generated_tests/web_2/native/native_test',
   ];
 
   bool _libraryIsGlobalNamespace = false;

pkg/compiler/lib/src/kernel/dart2js_target.dart

@@ -34,12 +34,12 @@ const Iterable<String> _allowedDartSchemePaths = const <String>[
 ];
 
 List<Pattern> _allowedNativeTestPatterns = [
-  RegExp(r'(?<!generated_)tests/dart2js/native'),
-  RegExp(r'(?<!generated_)tests/dart2js/internal'),
-  'generated_tests/dart2js/native/native_test',
-  RegExp(r'(?<!generated_)tests/dart2js_2/native'),
-  RegExp(r'(?<!generated_)tests/dart2js_2/internal'),
-  'generated_tests/dart2js_2/native/native_test',
+  RegExp(r'(?<!generated_)tests/web/native'),
+  RegExp(r'(?<!generated_)tests/web/internal'),
+  'generated_tests/web/native/native_test',
+  RegExp(r'(?<!generated_)tests/web_2/native'),
+  RegExp(r'(?<!generated_)tests/web_2/internal'),
+  'generated_tests/web_2/native/native_test',
 ];
 
 bool allowedNativeTest(Uri uri) {

pkg/compiler/test/codegen/model_data/constant_folding.dart

@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from tests/dart2js_2/constant_folding_test
+// Derived from tests/web_2/constant_folding_test
 
 import "package:expect/expect.dart";
 

pkg/compiler/test/deferred_loading/data/regress_35311/main.dart

@@ -15,12 +15,12 @@ main() async {
   await lib.loadLibrary();
 
   // inferred return-type in closures:
-  // lib.B f1() => lib.B(); // Compile time error(see tests/dart2js)
+  // lib.B f1() => lib.B(); // Compile time error(see tests/web)
   var f2 = /*closure_unit=main{}*/ () =>
       lib.B(); // no compile error, but f1 has inferred type: () -> d.B
 
   // inferred type-arguments
-  // lib.list = <lib.B>[]; // Compile time error(see tests/dart2js)
+  // lib.list = <lib.B>[]; // Compile time error(see tests/web)
   lib.list = []; // no error, but type parameter was injected here
   lib.list = lib.list
       .map(/*closure_unit=main{}*/ (x) => x.value)

pkg/compiler/test/end_to_end/all_native_test.dart

@@ -18,7 +18,7 @@ main() {
 
 test(List<String> options) async {
   DiagnosticCollector collector = new DiagnosticCollector();
-  String fileName = 'sdk/tests/dart2js_2/native/main.dart';
+  String fileName = 'sdk/tests/web_2/native/main.dart';
   Uri entryPoint = Uri.parse('memory:$fileName');
   await runCompiler(
       entryPoint: entryPoint,

pkg/compiler/test/equivalence/id_equivalence_helper.dart

@@ -464,9 +464,9 @@ Future<void> checkTests<T>(Directory dataDir, DataComputer<T> dataComputer,
 }
 
 Uri createUriForFileName(String fileName) {
-  // Pretend this is a dart2js_native test to allow use of 'native'
+  // Pretend this is a web/native test to allow use of 'native'
   // keyword and import of private libraries.
-  return Uri.parse('memory:sdk/tests/dart2js/native/$fileName');
+  return Uri.parse('memory:sdk/tests/web/native/$fileName');
 }
 
 Future<TestResult<T>> runTestForConfiguration<T>(TestConfig testConfiguration,

pkg/compiler/test/helpers/compiler_helper.dart

@@ -27,12 +27,10 @@ export 'package:compiler/src/util/util.dart';
 export 'output_collector.dart';
 
 String _commonTestPath(bool soundNullSafety) {
-  // Pretend this is a dart2js_native test to allow use of 'native' keyword
+  // Pretend this is a web/native test to allow use of 'native' keyword
   // and import of private libraries. However, we have to choose the correct
   // folder to enable / disable  implicit cfe opt out of null safety.
-  return soundNullSafety
-      ? 'sdk/tests/dart2js/native'
-      : 'sdk/tests/dart2js_2/native';
+  return soundNullSafety ? 'sdk/tests/web/native' : 'sdk/tests/web_2/native';
 }
 
 /// Compile [code] and returns either the code for [methodName] or, if

pkg/compiler/test/js/js_constant_test.dart

@@ -22,9 +22,9 @@ const String TEST_1 = r"""
 main() {
   runTest() async {
     check(String test) async {
-      // Pretend this is a dart2js_native test to allow use of 'native' keyword
+      // Pretend this is a web_2/native test to allow use of 'native' keyword
       // and import of private libraries.
-      String main = 'sdk/tests/dart2js_2/native/main.dart';
+      String main = 'sdk/tests/web_2/native/main.dart';
       Uri entryPoint = Uri.parse('memory:$main');
       var result = await runCompiler(
           entryPoint: entryPoint, memorySourceFiles: {main: test});

pkg/compiler/test/js/js_spec_optimization_test.dart

@@ -91,7 +91,7 @@ main() {
   runTests() async {
     check(String test) async {
       var checker = checkerForAbsentPresent(test);
-      String main = 'sdk/tests/dart2js_2/native/main.dart';
+      String main = 'sdk/tests/web_2/native/main.dart';
       Uri entryPoint = Uri.parse('memory:$main');
       var result = await runCompiler(
           entryPoint: entryPoint, memorySourceFiles: {main: test});

pkg/compiler/test/jsinterop/internal_annotations_test.dart

@@ -31,7 +31,7 @@ testClasses(String import1, String import2) async {
       {List<String> directlyInstantiated: const <String>[],
       List<String> abstractlyInstantiated: const <String>[],
       List<String> indirectlyInstantiated: const <String>[]}) async {
-    String mainFile = 'sdk/tests/dart2js_2/native/main.dart';
+    String mainFile = 'sdk/tests/web_2/native/main.dart';
     Uri entryPoint = Uri.parse('memory:$mainFile');
     CompilationResult result =
         await runCompiler(entryPoint: entryPoint, memorySourceFiles: {

pkg/compiler/test/jsinterop/interop_anonymous_unreachable_test.dart

@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-library tests.dart2js.interop_anonymous_unreachable_test;
+library tests.web.interop_anonymous_unreachable_test;
 
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';

pkg/compiler/test/member_usage/data/constant_folding.dart

@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from tests/dart2js_2/constant_folding_test
+// Derived from tests/web_2/constant_folding_test
 
 import "package:expect/expect.dart";
 

pkg/compiler/test/model/cfe_annotations_test.dart

@@ -19,7 +19,7 @@ import 'package:kernel/ast.dart' as ir;
 import '../helpers/args_helper.dart';
 import '../helpers/memory_compiler.dart';
 
-const String pathPrefix = 'sdk/tests/dart2js_2/native/';
+const String pathPrefix = 'sdk/tests/web_2/native/';
 
 const Map<String, String> source = {
   '$pathPrefix/main.dart': '''

pkg/compiler/test/model/native_test.dart

@@ -20,7 +20,7 @@ enum Kind {
 
 main() {
   asyncTest(() async {
-    await runTest('tests/dart2js_2/jsinterop_test.dart', '', {
+    await runTest('tests/web_2/jsinterop_test.dart', '', {
       'Class': Kind.regular,
       'JsInteropClass': Kind.jsInterop,
       'topLevelField': Kind.regular,
@@ -80,7 +80,7 @@ main() {
       '53',
       '54',
     ]);
-    await runTest('tests/dart2js_2/non_jsinterop_test.dart', '', {
+    await runTest('tests/web_2/non_jsinterop_test.dart', '', {
       'Class': Kind.regular,
       'JsInteropClass': Kind.jsInterop,
       'topLevelField': Kind.regular,
@@ -139,7 +139,7 @@ main() {
     ]);
 
     await runTest(
-        'tests/dart2js_2/native/native_test.dart', 'tests/dart2js_2/native/', {
+        'tests/web_2/native/native_test.dart', 'tests/web_2/native/', {
       'Class': Kind.regular,
       'NativeClass': Kind.native,
       'topLevelField': Kind.regular,

pkg/compiler/test/model/strong_mode_closed_world_test.dart

@@ -19,9 +19,9 @@ main() {
 }
 
 runTest() async {
-  // Pretend this is a dart2js_native test to allow use of 'native' keyword
+  // Pretend this is a web_2/native test to allow use of 'native' keyword
   // and import of private libraries.
-  String main = 'sdk/tests/dart2js_2/native/main.dart';
+  String main = 'sdk/tests/web_2/native/main.dart';
   Uri entryPoint = Uri.parse('memory:$main');
 
   CompilationResult result =

pkg/compiler/test/rti/data/as.dart

@@ -4,7 +4,7 @@
 
 // @dart = 2.7
 
-// Derived from tests/dart2js_2/generic_type_error_message_test.
+// Derived from tests/web_2/generic_type_error_message_test.
 
 import 'package:expect/expect.dart';
 

pkg/dev_compiler/lib/src/kernel/target.dart

@@ -450,10 +450,10 @@ class _CovarianceTransformer extends RecursiveVisitor<void> {
 
 List<Pattern> _allowedNativeTestPatterns = [
   'tests/dartdevc',
-  'tests/dart2js/native',
-  'tests/dart2js_2/native',
-  'tests/dart2js/internal',
-  'tests/dart2js_2/internal',
+  'tests/web/native',
+  'tests/web_2/native',
+  'tests/web/internal',
+  'tests/web_2/internal',
 ];
 
 bool allowedNativeTest(Uri uri) {

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -442,7 +442,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   static const List<String> optOutTestPaths = [
     'co19_2/',
     'corelib_2/',
-    'dart2js_2/',
+    'web_2/',
     'ffi_2',
     'language_2/',
     'lib_2/',

pkg/front_end/test/fasta/parser/parser.status

@@ -1545,220 +1545,220 @@ tests/corelib_strong/symbol_reserved_word_test: Fail
 tests/corelib/from_environment_const_type_test: Fail
 tests/corelib/from_environment_const_type_undefined_test: Fail
 tests/corelib/symbol_reserved_word_test: Fail
-tests/dart2js/deferred_custom_loader_test: Fail
-tests/dart2js/empty_negative_test: Fail
-tests/dart2js/invalid_annotation_test: Fail
-tests/dart2js/invalid_annotation2_test: Fail
-tests/dart2js/invalid_length_negative_test: Fail
-tests/dart2js/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
-tests/dart2js/switch_test: Fail
-tests/dart2js/timer_negative_test: Fail
-tests/dart2js/typed_locals_test: Fail
-tests/dart2js/native/abstract_class_test: Fail
-tests/dart2js/native/bound_closure_test: Fail
-tests/dart2js/native/browser_compat_1_prepatched_test: Fail
-tests/dart2js/native/browser_compat_1_unpatched_test: Fail
-tests/dart2js/native/browser_compat_2_test: Fail
-tests/dart2js/native/core_type_check_native_test: Fail
-tests/dart2js/native/dispatch_property_initialization_test: Fail
-tests/dart2js/native/downcast_test: Fail
-tests/dart2js/native/error_safeToString_test: Fail
-tests/dart2js/native/event_loop_test: Fail
-tests/dart2js/native/fake_thing_2_test: Fail
-tests/dart2js/native/fake_thing_test: Fail
-tests/dart2js/native/field_type_test: Fail
-tests/dart2js/native/field_type2_test: Fail
-tests/dart2js/native/fixup_get_tag_test: Fail
-tests/dart2js/native/hash_code_test: Fail
-tests/dart2js/native/issue9182_test: Fail
-tests/dart2js/native/jsobject_test: Fail
-tests/dart2js/native/native_call_arity1_frog_test: Fail
-tests/dart2js/native/native_call_arity2_frog_test: Fail
-tests/dart2js/native/native_call_arity3_frog_test: Fail
-tests/dart2js/native/native_checked_arguments1_frog_test: Fail
-tests/dart2js/native/native_checked_fields_frog_test: Fail
-tests/dart2js/native/native_class_avoids_hidden_name_frog_test: Fail
-tests/dart2js/native/native_class_fields_2_test: Fail
-tests/dart2js/native/native_class_fields_3_test: Fail
-tests/dart2js/native/native_class_fields_test: Fail
-tests/dart2js/native/native_class_inheritance1_frog_test: Fail
-tests/dart2js/native/native_class_inheritance2_frog_test: Fail
-tests/dart2js/native/native_class_inheritance3_frog_test: Fail
-tests/dart2js/native/native_class_inheritance4_frog_test: Fail
-tests/dart2js/native/native_class_is_check1_frog_test: Fail
-tests/dart2js/native/native_class_is_check3_frog_test: Fail
-tests/dart2js/native/native_class_with_dart_methods_frog_test: Fail
-tests/dart2js/native/native_closure_identity_frog_test: Fail
-tests/dart2js/native/native_constructor_name_test: Fail
-tests/dart2js/native/native_equals_frog_test: Fail
-tests/dart2js/native/native_exception2_test: Fail
-tests/dart2js/native/native_exceptions1_frog_test: Fail
-tests/dart2js/native/native_field_invocation_test: Fail
-tests/dart2js/native/native_field_invocation2_test: Fail
-tests/dart2js/native/native_field_invocation3_test: Fail
-tests/dart2js/native/native_field_invocation4_test: Fail
-tests/dart2js/native/native_field_invocation5_test: Fail
-tests/dart2js/native/native_field_invocation6_test: Fail
-tests/dart2js/native/native_field_name_test: Fail
-tests/dart2js/native/native_field_optimization_test: Fail
-tests/dart2js/native/native_field_rename_1_frog_test: Fail
-tests/dart2js/native/native_field_rename_2_frog_test: Fail
-tests/dart2js/native/native_library_same_name_used_frog_test: Fail
-tests/dart2js/native/native_library_same_name_used_lib2: Fail
-tests/dart2js/native/native_method_inlining_test: Fail
-tests/dart2js/native/native_method_rename1_frog_test: Fail
-tests/dart2js/native/native_method_rename2_frog_test: Fail
-tests/dart2js/native/native_method_rename3_frog_test: Fail
-tests/dart2js/native/native_method_with_keyword_name_test: Fail
-tests/dart2js/native/native_missing_method1_frog_test: Fail
-tests/dart2js/native/native_missing_method2_frog_test: Fail
-tests/dart2js/native/native_mixin_field_test: Fail
-tests/dart2js/native/native_mixin_multiple_test: Fail
-tests/dart2js/native/native_mixin_multiple2_test: Fail
-tests/dart2js/native/native_mixin_multiple3_test: Fail
-tests/dart2js/native/native_mixin_test: Fail
-tests/dart2js/native/native_mixin_with_plain_test: Fail
-tests/dart2js/native/native_named_constructors2_frog_test: Fail
-tests/dart2js/native/native_named_constructors3_frog_test: Fail
-tests/dart2js/native/native_no_such_method_exception_frog_test: Fail
-tests/dart2js/native/native_no_such_method_exception2_frog_test: Fail
-tests/dart2js/native/native_no_such_method_exception3_frog_test: Fail
-tests/dart2js/native/native_no_such_method_exception4_frog_test: Fail
-tests/dart2js/native/native_no_such_method_exception5_frog_test: Fail
-tests/dart2js/native/native_novel_html_test: Fail
-tests/dart2js/native/native_null_closure_frog_test: Fail
-tests/dart2js/native/native_null_frog_test: Fail
-tests/dart2js/native/native_property_frog_test: Fail
-tests/dart2js/native/native_testing: Fail
-tests/dart2js/native/native_to_string_frog_test: Fail
-tests/dart2js/native/native_use_native_name_in_table_frog_test: Fail
-tests/dart2js/native/native_wrapping_function_frog_test: Fail
-tests/dart2js/native/native_wrapping_function3_frog_test: Fail
-tests/dart2js/native/oddly_named_fields_test: Fail
-tests/dart2js/native/runtimetype_test: Fail
-tests/dart2js/native/static_methods_test: Fail
-tests/dart2js/native/subclassing_1_test: Fail
-tests/dart2js/native/subclassing_2_test: Fail
-tests/dart2js/native/subclassing_3_test: Fail
-tests/dart2js/native/subclassing_4_test: Fail
-tests/dart2js/native/subclassing_5_test: Fail
-tests/dart2js/native/subclassing_constructor_1_test: Fail
-tests/dart2js/native/subclassing_super_call_test: Fail
-tests/dart2js/native/subclassing_super_field_1_test: Fail
-tests/dart2js/native/subclassing_super_field_2_test: Fail
-tests/dart2js/native/subclassing_type_test: Fail
-tests/dart2js/native/super_call_test: Fail
-tests/dart2js/native/super_property_test: Fail
-tests/dart2js/switch_test: Fail
-tests/dart2js/timer_negative_test: Fail
-tests/dart2js/typed_locals_test: Fail
-tests/dart2js_2/deferred_custom_loader_test: Fail
-tests/dart2js_2/empty_negative_test: Fail
-tests/dart2js_2/invalid_annotation_test: Fail
-tests/dart2js_2/invalid_annotation2_test: Fail
-tests/dart2js_2/invalid_length_negative_test: Fail
-tests/dart2js_2/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
-tests/dart2js_2/switch_test: Fail
-tests/dart2js_2/timer_negative_test: Fail
-tests/dart2js_2/typed_locals_test: Fail
-tests/dart2js_2/native/abstract_class_test: Fail
-tests/dart2js_2/native/bound_closure_test: Fail
-tests/dart2js_2/native/browser_compat_1_prepatched_test: Fail
-tests/dart2js_2/native/browser_compat_1_unpatched_test: Fail
-tests/dart2js_2/native/browser_compat_2_test: Fail
-tests/dart2js_2/native/core_type_check_native_test: Fail
-tests/dart2js_2/native/dispatch_property_initialization_test: Fail
-tests/dart2js_2/native/downcast_test: Fail
-tests/dart2js_2/native/error_safeToString_test: Fail
-tests/dart2js_2/native/event_loop_test: Fail
-tests/dart2js_2/native/fake_thing_2_test: Fail
-tests/dart2js_2/native/fake_thing_test: Fail
-tests/dart2js_2/native/field_type_test: Fail
-tests/dart2js_2/native/field_type2_test: Fail
-tests/dart2js_2/native/fixup_get_tag_test: Fail
-tests/dart2js_2/native/hash_code_test: Fail
-tests/dart2js_2/native/issue9182_test: Fail
-tests/dart2js_2/native/jsobject_test: Fail
-tests/dart2js_2/native/native_call_arity1_frog_test: Fail
-tests/dart2js_2/native/native_call_arity2_frog_test: Fail
-tests/dart2js_2/native/native_call_arity3_frog_test: Fail
-tests/dart2js_2/native/native_checked_arguments1_frog_test: Fail
-tests/dart2js_2/native/native_checked_fields_frog_test: Fail
-tests/dart2js_2/native/native_class_avoids_hidden_name_frog_test: Fail
-tests/dart2js_2/native/native_class_fields_2_test: Fail
-tests/dart2js_2/native/native_class_fields_3_test: Fail
-tests/dart2js_2/native/native_class_fields_test: Fail
-tests/dart2js_2/native/native_class_inheritance1_frog_test: Fail
-tests/dart2js_2/native/native_class_inheritance2_frog_test: Fail
-tests/dart2js_2/native/native_class_inheritance3_frog_test: Fail
-tests/dart2js_2/native/native_class_inheritance4_frog_test: Fail
-tests/dart2js_2/native/native_class_is_check1_frog_test: Fail
-tests/dart2js_2/native/native_class_is_check3_frog_test: Fail
-tests/dart2js_2/native/native_class_with_dart_methods_frog_test: Fail
-tests/dart2js_2/native/native_closure_identity_frog_test: Fail
-tests/dart2js_2/native/native_constructor_name_test: Fail
-tests/dart2js_2/native/native_equals_frog_test: Fail
-tests/dart2js_2/native/native_exception2_test: Fail
-tests/dart2js_2/native/native_exceptions1_frog_test: Fail
-tests/dart2js_2/native/native_field_invocation_test: Fail
-tests/dart2js_2/native/native_field_invocation2_test: Fail
-tests/dart2js_2/native/native_field_invocation3_test: Fail
-tests/dart2js_2/native/native_field_invocation4_test: Fail
-tests/dart2js_2/native/native_field_invocation5_test: Fail
-tests/dart2js_2/native/native_field_invocation6_test: Fail
-tests/dart2js_2/native/native_field_name_test: Fail
-tests/dart2js_2/native/native_field_optimization_test: Fail
-tests/dart2js_2/native/native_field_rename_1_frog_test: Fail
-tests/dart2js_2/native/native_field_rename_2_frog_test: Fail
-tests/dart2js_2/native/native_library_same_name_used_frog_test: Fail
-tests/dart2js_2/native/native_library_same_name_used_lib2: Fail
-tests/dart2js_2/native/native_method_inlining_test: Fail
-tests/dart2js_2/native/native_method_rename1_frog_test: Fail
-tests/dart2js_2/native/native_method_rename2_frog_test: Fail
-tests/dart2js_2/native/native_method_rename3_frog_test: Fail
-tests/dart2js_2/native/native_method_with_keyword_name_test: Fail
-tests/dart2js_2/native/native_missing_method1_frog_test: Fail
-tests/dart2js_2/native/native_missing_method2_frog_test: Fail
-tests/dart2js_2/native/native_mixin_field_test: Fail
-tests/dart2js_2/native/native_mixin_multiple_test: Fail
-tests/dart2js_2/native/native_mixin_multiple2_test: Fail
-tests/dart2js_2/native/native_mixin_multiple3_test: Fail
-tests/dart2js_2/native/native_mixin_test: Fail
-tests/dart2js_2/native/native_mixin_with_plain_test: Fail
-tests/dart2js_2/native/native_named_constructors2_frog_test: Fail
-tests/dart2js_2/native/native_named_constructors3_frog_test: Fail
-tests/dart2js_2/native/native_no_such_method_exception_frog_test: Fail
-tests/dart2js_2/native/native_no_such_method_exception2_frog_test: Fail
-tests/dart2js_2/native/native_no_such_method_exception3_frog_test: Fail
-tests/dart2js_2/native/native_no_such_method_exception4_frog_test: Fail
-tests/dart2js_2/native/native_no_such_method_exception5_frog_test: Fail
-tests/dart2js_2/native/native_novel_html_test: Fail
-tests/dart2js_2/native/native_null_closure_frog_test: Fail
-tests/dart2js_2/native/native_null_frog_test: Fail
-tests/dart2js_2/native/native_property_frog_test: Fail
-tests/dart2js_2/native/native_testing: Fail
-tests/dart2js_2/native/native_to_string_frog_test: Fail
-tests/dart2js_2/native/native_use_native_name_in_table_frog_test: Fail
-tests/dart2js_2/native/native_wrapping_function_frog_test: Fail
-tests/dart2js_2/native/native_wrapping_function3_frog_test: Fail
-tests/dart2js_2/native/oddly_named_fields_test: Fail
-tests/dart2js_2/native/runtimetype_test: Fail
-tests/dart2js_2/native/static_methods_test: Fail
-tests/dart2js_2/native/subclassing_1_test: Fail
-tests/dart2js_2/native/subclassing_2_test: Fail
-tests/dart2js_2/native/subclassing_3_test: Fail
-tests/dart2js_2/native/subclassing_4_test: Fail
-tests/dart2js_2/native/subclassing_5_test: Fail
-tests/dart2js_2/native/subclassing_constructor_1_test: Fail
-tests/dart2js_2/native/subclassing_super_call_test: Fail
-tests/dart2js_2/native/subclassing_super_field_1_test: Fail
-tests/dart2js_2/native/subclassing_super_field_2_test: Fail
-tests/dart2js_2/native/subclassing_type_test: Fail
-tests/dart2js_2/native/super_call_test: Fail
-tests/dart2js_2/native/super_property_test: Fail
-tests/dart2js_2/switch_test: Fail
-tests/dart2js_2/timer_negative_test: Fail
-tests/dart2js_2/typed_locals_test: Fail
+tests/web/deferred_custom_loader_test: Fail
+tests/web/empty_negative_test: Fail
+tests/web/invalid_annotation_test: Fail
+tests/web/invalid_annotation2_test: Fail
+tests/web/invalid_length_negative_test: Fail
+tests/web/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
+tests/web/switch_test: Fail
+tests/web/timer_negative_test: Fail
+tests/web/typed_locals_test: Fail
+tests/web/native/abstract_class_test: Fail
+tests/web/native/bound_closure_test: Fail
+tests/web/native/browser_compat_1_prepatched_test: Fail
+tests/web/native/browser_compat_1_unpatched_test: Fail
+tests/web/native/browser_compat_2_test: Fail
+tests/web/native/core_type_check_native_test: Fail
+tests/web/native/dispatch_property_initialization_test: Fail
+tests/web/native/downcast_test: Fail
+tests/web/native/error_safeToString_test: Fail
+tests/web/native/event_loop_test: Fail
+tests/web/native/fake_thing_2_test: Fail
+tests/web/native/fake_thing_test: Fail
+tests/web/native/field_type_test: Fail
+tests/web/native/field_type2_test: Fail
+tests/web/native/fixup_get_tag_test: Fail
+tests/web/native/hash_code_test: Fail
+tests/web/native/issue9182_test: Fail
+tests/web/native/jsobject_test: Fail
+tests/web/native/native_call_arity1_frog_test: Fail
+tests/web/native/native_call_arity2_frog_test: Fail
+tests/web/native/native_call_arity3_frog_test: Fail
+tests/web/native/native_checked_arguments1_frog_test: Fail
+tests/web/native/native_checked_fields_frog_test: Fail
+tests/web/native/native_class_avoids_hidden_name_frog_test: Fail
+tests/web/native/native_class_fields_2_test: Fail
+tests/web/native/native_class_fields_3_test: Fail
+tests/web/native/native_class_fields_test: Fail
+tests/web/native/native_class_inheritance1_frog_test: Fail
+tests/web/native/native_class_inheritance2_frog_test: Fail
+tests/web/native/native_class_inheritance3_frog_test: Fail
+tests/web/native/native_class_inheritance4_frog_test: Fail
+tests/web/native/native_class_is_check1_frog_test: Fail
+tests/web/native/native_class_is_check3_frog_test: Fail
+tests/web/native/native_class_with_dart_methods_frog_test: Fail
+tests/web/native/native_closure_identity_frog_test: Fail
+tests/web/native/native_constructor_name_test: Fail
+tests/web/native/native_equals_frog_test: Fail
+tests/web/native/native_exception2_test: Fail
+tests/web/native/native_exceptions1_frog_test: Fail
+tests/web/native/native_field_invocation_test: Fail
+tests/web/native/native_field_invocation2_test: Fail
+tests/web/native/native_field_invocation3_test: Fail
+tests/web/native/native_field_invocation4_test: Fail
+tests/web/native/native_field_invocation5_test: Fail
+tests/web/native/native_field_invocation6_test: Fail
+tests/web/native/native_field_name_test: Fail
+tests/web/native/native_field_optimization_test: Fail
+tests/web/native/native_field_rename_1_frog_test: Fail
+tests/web/native/native_field_rename_2_frog_test: Fail
+tests/web/native/native_library_same_name_used_frog_test: Fail
+tests/web/native/native_library_same_name_used_lib2: Fail
+tests/web/native/native_method_inlining_test: Fail
+tests/web/native/native_method_rename1_frog_test: Fail
+tests/web/native/native_method_rename2_frog_test: Fail
+tests/web/native/native_method_rename3_frog_test: Fail
+tests/web/native/native_method_with_keyword_name_test: Fail
+tests/web/native/native_missing_method1_frog_test: Fail
+tests/web/native/native_missing_method2_frog_test: Fail
+tests/web/native/native_mixin_field_test: Fail
+tests/web/native/native_mixin_multiple_test: Fail
+tests/web/native/native_mixin_multiple2_test: Fail
+tests/web/native/native_mixin_multiple3_test: Fail
+tests/web/native/native_mixin_test: Fail
+tests/web/native/native_mixin_with_plain_test: Fail
+tests/web/native/native_named_constructors2_frog_test: Fail
+tests/web/native/native_named_constructors3_frog_test: Fail
+tests/web/native/native_no_such_method_exception_frog_test: Fail
+tests/web/native/native_no_such_method_exception2_frog_test: Fail
+tests/web/native/native_no_such_method_exception3_frog_test: Fail
+tests/web/native/native_no_such_method_exception4_frog_test: Fail
+tests/web/native/native_no_such_method_exception5_frog_test: Fail
+tests/web/native/native_novel_html_test: Fail
+tests/web/native/native_null_closure_frog_test: Fail
+tests/web/native/native_null_frog_test: Fail
+tests/web/native/native_property_frog_test: Fail
+tests/web/native/native_testing: Fail
+tests/web/native/native_to_string_frog_test: Fail
+tests/web/native/native_use_native_name_in_table_frog_test: Fail
+tests/web/native/native_wrapping_function_frog_test: Fail
+tests/web/native/native_wrapping_function3_frog_test: Fail
+tests/web/native/oddly_named_fields_test: Fail
+tests/web/native/runtimetype_test: Fail
+tests/web/native/static_methods_test: Fail
+tests/web/native/subclassing_1_test: Fail
+tests/web/native/subclassing_2_test: Fail
+tests/web/native/subclassing_3_test: Fail
+tests/web/native/subclassing_4_test: Fail
+tests/web/native/subclassing_5_test: Fail
+tests/web/native/subclassing_constructor_1_test: Fail
+tests/web/native/subclassing_super_call_test: Fail
+tests/web/native/subclassing_super_field_1_test: Fail
+tests/web/native/subclassing_super_field_2_test: Fail
+tests/web/native/subclassing_type_test: Fail
+tests/web/native/super_call_test: Fail
+tests/web/native/super_property_test: Fail
+tests/web/switch_test: Fail
+tests/web/timer_negative_test: Fail
+tests/web/typed_locals_test: Fail
+tests/web_2/deferred_custom_loader_test: Fail
+tests/web_2/empty_negative_test: Fail
+tests/web_2/invalid_annotation_test: Fail
+tests/web_2/invalid_annotation2_test: Fail
+tests/web_2/invalid_length_negative_test: Fail
+tests/web_2/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
+tests/web_2/switch_test: Fail
+tests/web_2/timer_negative_test: Fail
+tests/web_2/typed_locals_test: Fail
+tests/web_2/native/abstract_class_test: Fail
+tests/web_2/native/bound_closure_test: Fail
+tests/web_2/native/browser_compat_1_prepatched_test: Fail
+tests/web_2/native/browser_compat_1_unpatched_test: Fail
+tests/web_2/native/browser_compat_2_test: Fail
+tests/web_2/native/core_type_check_native_test: Fail
+tests/web_2/native/dispatch_property_initialization_test: Fail
+tests/web_2/native/downcast_test: Fail
+tests/web_2/native/error_safeToString_test: Fail
+tests/web_2/native/event_loop_test: Fail
+tests/web_2/native/fake_thing_2_test: Fail
+tests/web_2/native/fake_thing_test: Fail
+tests/web_2/native/field_type_test: Fail
+tests/web_2/native/field_type2_test: Fail
+tests/web_2/native/fixup_get_tag_test: Fail
+tests/web_2/native/hash_code_test: Fail
+tests/web_2/native/issue9182_test: Fail
+tests/web_2/native/jsobject_test: Fail
+tests/web_2/native/native_call_arity1_frog_test: Fail
+tests/web_2/native/native_call_arity2_frog_test: Fail
+tests/web_2/native/native_call_arity3_frog_test: Fail
+tests/web_2/native/native_checked_arguments1_frog_test: Fail
+tests/web_2/native/native_checked_fields_frog_test: Fail
+tests/web_2/native/native_class_avoids_hidden_name_frog_test: Fail
+tests/web_2/native/native_class_fields_2_test: Fail
+tests/web_2/native/native_class_fields_3_test: Fail
+tests/web_2/native/native_class_fields_test: Fail
+tests/web_2/native/native_class_inheritance1_frog_test: Fail
+tests/web_2/native/native_class_inheritance2_frog_test: Fail
+tests/web_2/native/native_class_inheritance3_frog_test: Fail
+tests/web_2/native/native_class_inheritance4_frog_test: Fail
+tests/web_2/native/native_class_is_check1_frog_test: Fail
+tests/web_2/native/native_class_is_check3_frog_test: Fail
+tests/web_2/native/native_class_with_dart_methods_frog_test: Fail
+tests/web_2/native/native_closure_identity_frog_test: Fail
+tests/web_2/native/native_constructor_name_test: Fail
+tests/web_2/native/native_equals_frog_test: Fail
+tests/web_2/native/native_exception2_test: Fail
+tests/web_2/native/native_exceptions1_frog_test: Fail
+tests/web_2/native/native_field_invocation_test: Fail
+tests/web_2/native/native_field_invocation2_test: Fail
+tests/web_2/native/native_field_invocation3_test: Fail
+tests/web_2/native/native_field_invocation4_test: Fail
+tests/web_2/native/native_field_invocation5_test: Fail
+tests/web_2/native/native_field_invocation6_test: Fail
+tests/web_2/native/native_field_name_test: Fail
+tests/web_2/native/native_field_optimization_test: Fail
+tests/web_2/native/native_field_rename_1_frog_test: Fail
+tests/web_2/native/native_field_rename_2_frog_test: Fail
+tests/web_2/native/native_library_same_name_used_frog_test: Fail
+tests/web_2/native/native_library_same_name_used_lib2: Fail
+tests/web_2/native/native_method_inlining_test: Fail
+tests/web_2/native/native_method_rename1_frog_test: Fail
+tests/web_2/native/native_method_rename2_frog_test: Fail
+tests/web_2/native/native_method_rename3_frog_test: Fail
+tests/web_2/native/native_method_with_keyword_name_test: Fail
+tests/web_2/native/native_missing_method1_frog_test: Fail
+tests/web_2/native/native_missing_method2_frog_test: Fail
+tests/web_2/native/native_mixin_field_test: Fail
+tests/web_2/native/native_mixin_multiple_test: Fail
+tests/web_2/native/native_mixin_multiple2_test: Fail
+tests/web_2/native/native_mixin_multiple3_test: Fail
+tests/web_2/native/native_mixin_test: Fail
+tests/web_2/native/native_mixin_with_plain_test: Fail
+tests/web_2/native/native_named_constructors2_frog_test: Fail
+tests/web_2/native/native_named_constructors3_frog_test: Fail
+tests/web_2/native/native_no_such_method_exception_frog_test: Fail
+tests/web_2/native/native_no_such_method_exception2_frog_test: Fail
+tests/web_2/native/native_no_such_method_exception3_frog_test: Fail
+tests/web_2/native/native_no_such_method_exception4_frog_test: Fail
+tests/web_2/native/native_no_such_method_exception5_frog_test: Fail
+tests/web_2/native/native_novel_html_test: Fail
+tests/web_2/native/native_null_closure_frog_test: Fail
+tests/web_2/native/native_null_frog_test: Fail
+tests/web_2/native/native_property_frog_test: Fail
+tests/web_2/native/native_testing: Fail
+tests/web_2/native/native_to_string_frog_test: Fail
+tests/web_2/native/native_use_native_name_in_table_frog_test: Fail
+tests/web_2/native/native_wrapping_function_frog_test: Fail
+tests/web_2/native/native_wrapping_function3_frog_test: Fail
+tests/web_2/native/oddly_named_fields_test: Fail
+tests/web_2/native/runtimetype_test: Fail
+tests/web_2/native/static_methods_test: Fail
+tests/web_2/native/subclassing_1_test: Fail
+tests/web_2/native/subclassing_2_test: Fail
+tests/web_2/native/subclassing_3_test: Fail
+tests/web_2/native/subclassing_4_test: Fail
+tests/web_2/native/subclassing_5_test: Fail
+tests/web_2/native/subclassing_constructor_1_test: Fail
+tests/web_2/native/subclassing_super_call_test: Fail
+tests/web_2/native/subclassing_super_field_1_test: Fail
+tests/web_2/native/subclassing_super_field_2_test: Fail
+tests/web_2/native/subclassing_type_test: Fail
+tests/web_2/native/super_call_test: Fail
+tests/web_2/native/super_property_test: Fail
+tests/web_2/switch_test: Fail
+tests/web_2/timer_negative_test: Fail
+tests/web_2/typed_locals_test: Fail
 tests/language_2/abstract_syntax_test: Fail
 tests/language_2/arg_param_trailing_comma_test: Fail
 tests/language_strong/argument_definition_test: Fail

pkg/front_end/test/fasta/scanner/scanner.status

@@ -3,9 +3,9 @@
 # BSD-style license that can be found in the LICENSE.md file.
 
 pkg/testing/test/dart_sdk_negative_test: Fail
-tests/dart2js_2/empty_negative_test: Fail
-tests/dart2js_2/invalid_length_negative_test: Fail
-tests/dart2js_2/timer_negative_test: Fail
+tests/web_2/empty_negative_test: Fail
+tests/web_2/invalid_length_negative_test: Fail
+tests/web_2/timer_negative_test: Fail
 tests/language_strong/assign_instance_method_negative_test: Fail
 tests/language_strong/bad_initializer1_negative_test: Fail
 tests/language_strong/bad_initializer2_negative_test: Fail

pkg/front_end/testing.json

@@ -421,7 +421,7 @@
       "command-lines": [
         "--checked dart2js",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_2"
+        "-cdart2js -rd8 web_2"
       ]
     },
     {
@@ -433,7 +433,7 @@
       "common": "--time -pcolor --report -ax64 -mrelease --write-result-log",
       "command-lines": [
         "-t240 pkg/(kernel|front_end|fasta) --checked",
-        "-t240 dart2js/analyze_test",
+        "-t240 web/analyze_test",
         "-cdartk -rvm"
       ]
     },
@@ -448,7 +448,7 @@
         "-t240 --checked pkg/(kernel|front_end|fasta) dart2js",
         "-cdartk -rvm",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_2"
+        "-cdart2js -rd8 web_2"
       ]
     },
     {
@@ -459,7 +459,7 @@
       "mode": "release",
       "common": "--dart2js-batch --time -pcolor --report -ax64 -mrelease --write-result-log",
       "command-lines": [
-        "-cdart2js -rd8 --use-sdk --minified language language_2 dart2js_2 corelib corelib_2"
+        "-cdart2js -rd8 --use-sdk --minified language language_2 web_2 corelib corelib_2"
       ]
     }
   ],

pkg/test_runner/lib/src/test_configurations.dart

@@ -40,8 +40,8 @@ final testSuiteDirectories = [
   Path('samples-dev'),
   Path('tests/corelib'),
   Path('tests/corelib_2'),
-  Path('tests/dart2js'),
-  Path('tests/dart2js_2'),
+  Path('tests/web'),
+  Path('tests/web_2'),
   Path('tests/dartdevc'),
   Path('tests/dartdevc_2'),
   Path('tests/language'),

sdk/lib/_internal/js_runtime/lib/js_helper.dart

@@ -3007,7 +3007,7 @@ void applyExtension(name, nativeObject) {}
 // This is currently a no-op in dart2js, but used for native tests.
 void applyTestExtensions(List<String> names) {}
 
-// See tests/dart2js_2/platform_environment_variable1_test.dart
+// See tests/web_2/platform_environment_variable1_test.dart
 const String testPlatformEnvironmentVariableValue = String.fromEnvironment(
     'dart2js.test.platform.environment.variable',
     defaultValue: 'not-specified');