[dart2js] Move tests/compiler/dart2js_extra to tests/dart2js_2.

Change-Id: Iaa0ca2b4f2d1b15f79ddca37834d3ed2497bc068
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149242
Commit-Queue: Joshua Litt <joshualitt@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>

.gitattributes

@@ -13,11 +13,11 @@
 *.md text
 *.yaml text
 
-# Files that should not be converted.
-tests/compiler/dart2js_extra/eof_line_ending_test.dart -text
-tests/compiler/dart2js_extra/string_interpolation_test.dart -text
-tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart -text
-tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart -text
+# File that should not be converted.
+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/language_2/string/raw_string_test.dart -text
 tests/language_2/string/multiline_strings_test.dart -text
 tests/language_2/string/multiline_newline_cr.dart -text

pkg/compiler/lib/src/js_model/element_map_impl.dart

@@ -1332,7 +1332,8 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
       var mainUri = elementEnvironment.mainLibrary.canonicalUri;
       // Tests permit lookup outside of dart: libraries.
       return mainUri.path.contains('tests/compiler/dart2js_native') ||
-          mainUri.path.contains('tests/compiler/dart2js_extra');
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native'));
     }
 
     DartType lookup(String typeName, {bool required}) {

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

@@ -36,7 +36,8 @@ bool maybeEnableNative(Uri uri) {
   bool allowedTestLibrary() {
     String scriptName = uri.path;
     return scriptName.contains('tests/compiler/dart2js_native') ||
-        scriptName.contains('tests/compiler/dart2js_extra') ||
+        scriptName.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native')) ||
+        scriptName.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
         scriptName.contains('generated_tests/dart2js_native/native_test');
   }
 

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

@@ -916,7 +916,8 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
       var mainUri = elementEnvironment.mainLibrary.canonicalUri;
       // Tests permit lookup outside of dart: libraries.
       return mainUri.path.contains('tests/compiler/dart2js_native') ||
-          mainUri.path.contains('tests/compiler/dart2js_extra');
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/internal')) ||
+          mainUri.path.contains(RegExp(r'(?<!generated_)tests/dart2js_2/native'));
     }
 
     DartType lookup(String typeName, {bool required}) {

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

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

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

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

pkg/compiler/test/model/native_test.dart

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

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

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

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

@@ -424,9 +424,9 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
 
   static const List<String> optOutTestPaths = [
     'co19_2/',
-    'compiler/dart2js_extra/',
     'compiler/dart2js_native/',
     'corelib_2/',
+    'dart2js_2/',
     'ffi_2',
     'language_2/',
     'lib_2/',

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

@@ -1540,15 +1540,6 @@ tests/co19/src/LibTest/html/HttpRequest/responseType_A01_t03: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/Document-createElement_t01: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/DOMImplementation-createHTMLDocument_t01: Fail
 tests/co19/src/WebPlatformTest/dom/nodes/Element-childElementCount-nochild_t01: Fail
-tests/compiler/dart2js_extra/deferred_custom_loader_test: Fail
-tests/compiler/dart2js_extra/empty_negative_test: Fail
-tests/compiler/dart2js_extra/invalid_annotation_test: Fail
-tests/compiler/dart2js_extra/invalid_annotation2_test: Fail
-tests/compiler/dart2js_extra/invalid_length_negative_test: Fail
-tests/compiler/dart2js_extra/LayoutTests_fast_mediastream_getusermedia_t01_test: Fail
-tests/compiler/dart2js_extra/switch_test: Fail
-tests/compiler/dart2js_extra/timer_negative_test: Fail
-tests/compiler/dart2js_extra/typed_locals_test: Fail
 tests/compiler/dart2js_native/abstract_class_test: Fail
 tests/compiler/dart2js_native/bound_closure_test: Fail
 tests/compiler/dart2js_native/browser_compat_1_prepatched_test: Fail
@@ -1650,6 +1641,15 @@ 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_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/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/compiler/dart2js_extra/empty_negative_test: Fail
-tests/compiler/dart2js_extra/invalid_length_negative_test: Fail
-tests/compiler/dart2js_extra/timer_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/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

@@ -409,7 +409,7 @@
       "command-lines": [
         "--checked dart2js",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_extra dart2js_native"
+        "-cdart2js -rd8 dart2js_2 dart2js_native"
       ]
     },
     {
@@ -436,7 +436,7 @@
         "-t240 --checked pkg/(kernel|front_end|fasta) dart2js",
         "-cdartk -rvm",
         "-cdart2js -rd8 --exclude-suite=observatory_ui",
-        "-cdart2js -rd8 dart2js_extra dart2js_native"
+        "-cdart2js -rd8 dart2js_2 dart2js_native"
       ]
     },
     {
@@ -447,7 +447,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_extra dart2js_native corelib corelib_2"
+        "-cdart2js -rd8 --use-sdk --minified language language_2 dart2js_2 dart2js_native corelib corelib_2"
       ]
     }
   ],

pkg/test_runner/lib/src/test_configurations.dart

@@ -32,11 +32,11 @@ final testSuiteDirectories = [
   Path('runtime/observatory/tests/observatory_ui'),
   Path('samples'),
   Path('samples-dev'),
-  Path('tests/compiler/dart2js_extra'),
   Path('tests/compiler/dart2js_native'),
   Path('tests/compiler/dartdevc_native'),
   Path('tests/corelib'),
   Path('tests/corelib_2'),
+  Path('tests/dart2js_2'),
   Path('tests/kernel'),
   Path('tests/language'),
   Path('tests/language_2'),

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

@@ -3543,7 +3543,7 @@ void registerGlobalObject(object) {}
 // This is currently a no-op in dart2js.
 void applyExtension(name, nativeObject) {}
 
-// See tests/compiler/dart2js_extra/platform_environment_variable1_test.dart
+// See tests/dart2js_2/platform_environment_variable1_test.dart
 const String testPlatformEnvironmentVariableValue = String.fromEnvironment(
     'dart2js.test.platform.environment.variable',
     defaultValue: 'not-specified');

sdk_nnbd/lib/_internal/js_runtime/lib/js_helper.dart

@@ -3569,7 +3569,7 @@ void registerGlobalObject(object) {}
 // This is currently a no-op in dart2js.
 void applyExtension(name, nativeObject) {}
 
-// See tests/compiler/dart2js_extra/platform_environment_variable1_test.dart
+// See tests/dart2js_2/platform_environment_variable1_test.dart
 const String testPlatformEnvironmentVariableValue = String.fromEnvironment(
     'dart2js.test.platform.environment.variable',
     defaultValue: 'not-specified');