Skip to content

Commit bff2098

Browse files
sigmundchcommit-bot@chromium.org
authored andcommitted
[cfe] remove whitelist of opt-out packages
Closes #40775 Change-Id: Ib713494edf34046bbf7de43811659863fbc5884e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138901 Reviewed-by: Bob Nystrom <[email protected]> Commit-Queue: Sigmund Cherem <[email protected]>
1 parent be548e7 commit bff2098

File tree

2 files changed

+9
-122
lines changed

2 files changed

+9
-122
lines changed

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

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -387,16 +387,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
387387
loader.target.enableNonNullable &&
388388
languageVersion.major >= enableNonNullableMajorVersion &&
389389
languageVersion.minor >= enableNonNullableMinorVersion &&
390-
!isOptOutPackage(library.importUri) &&
391390
!isOptOutTest(library.importUri);
392391

393-
bool isOptOutPackage(Uri uri) {
394-
if (!uri.isScheme('package')) return false;
395-
if (uri.pathSegments.isEmpty) return false;
396-
String packageName = uri.pathSegments.first;
397-
return optOutPackages.contains(packageName);
398-
}
399-
400392
bool isOptOutTest(Uri uri) {
401393
String path = uri.path;
402394
for (String testDir in ['/tests/', '/generated_tests/']) {
@@ -409,120 +401,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
409401
return false;
410402
}
411403

412-
// TODO(johnniwinther): remove this logic. Opted out packages should be
413-
// computed using language versioning and .packages.json.
414-
static final Set<String> optOutPackages = {
415-
'_fe_analyzer_shared',
416-
'analysis_server',
417-
'analysis_server_client',
418-
'analysis_tool',
419-
'analyzer',
420-
'analyzer_cli',
421-
'analyzer_fe_comparison',
422-
'analyzer_plugin',
423-
'args',
424-
'async',
425-
'async_helper',
426-
'bazel_worker',
427-
'benchmark_harness',
428-
'boolean_selector',
429-
'build_integration',
430-
'charcode',
431-
'cli_util',
432-
'collection',
433-
'compiler',
434-
'convert',
435-
'crypto',
436-
'csslib',
437-
'dart2js_info',
438-
'dart2js_tools',
439-
'dart2native',
440-
'dart_internal',
441-
'dart_style',
442-
'dartdoc',
443-
'dartfix',
444-
'dev_compiler',
445-
'diagnostic',
446-
'expect',
447-
'ffi',
448-
'fixnum',
449-
'frontend_server',
450-
'front_end',
451-
'gardening',
452-
'glob',
453-
'html',
454-
'http',
455-
'http_io',
456-
'http_multi_server',
457-
'http_parser',
458-
'http_retry',
459-
'http_throttle',
460-
'intl',
461-
'js',
462-
'js_ast',
463-
'js_runtime',
464-
'json_rpc_2',
465-
'kernel',
466-
'linter',
467-
'logging',
468-
'markdown',
469-
'matcher',
470-
'meta',
471-
'mime',
472-
'mockito',
473-
'modular_test',
474-
'mustache',
475-
'native_stack_traces',
476-
'nnbd_migration',
477-
'oauth2',
478-
'observatory',
479-
'observatory_test_package',
480-
'package_config',
481-
'package_resolver',
482-
'path',
483-
'pedantic',
484-
'pool',
485-
'protobuf',
486-
'pub',
487-
'pub_semver',
488-
'quiver',
489-
'resource',
490-
'sdk_library_metadata',
491-
'shelf',
492-
'shelf_packages_handler',
493-
'shelf_static',
494-
'shelf_web_socket',
495-
'smith',
496-
'source_map_stack_trace',
497-
'sourcemap_testing',
498-
'source_maps',
499-
'source_span',
500-
'stack_trace',
501-
'status_file',
502-
'stream_channel',
503-
'string_scanner',
504-
'telemetry',
505-
'term_glyph',
506-
'test',
507-
'test_api',
508-
'test_core',
509-
'test_descriptor',
510-
'test_process',
511-
'test_reflective_loader',
512-
'test_runner',
513-
'testing',
514-
'tflite_native',
515-
'typed_data',
516-
'unittest',
517-
'usage',
518-
'vm',
519-
'vm_service',
520-
'watcher',
521-
'web_components',
522-
'web_socket_channel',
523-
'yaml',
524-
};
525-
526404
static final Set<String> optOutTestPaths = {
527405
'/tests/co19_2',
528406
'/tests/corelib_2',

tools/bots/test_matrix.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"filesets": {
1111
"analyzer_unit_tests": [
1212
".packages",
13+
".dart_tool/package_config.json",
1314
"pkg/",
1415
"tests/compiler/dart2js/",
1516
"third_party/pkg/",
@@ -22,6 +23,7 @@
2223
],
2324
"dart2js": [
2425
".packages",
26+
".dart_tool/package_config.json",
2527
"out/ReleaseIA32/dart-sdk/",
2628
"out/ReleaseX64/dart-sdk/",
2729
"out/ReleaseX64/gen/utils/dartdevc/",
@@ -62,6 +64,7 @@
6264
],
6365
"dart2js_nnbd": [
6466
".packages",
67+
".dart_tool/package_config.json",
6568
"out/ReleaseIA32NNBD/dart-sdk/",
6669
"out/ReleaseX64NNBD/dart-sdk/",
6770
"out/ReleaseX64NNBD/gen/utils/dartdevc/",
@@ -105,6 +108,7 @@
105108
],
106109
"dart2js_hostasserts": [
107110
".packages",
111+
".dart_tool/package_config.json",
108112
"out/ReleaseIA32/dart",
109113
"out/ReleaseIA32/dart2js_platform.dill",
110114
"out/ReleaseIA32/dart2js_platform_strong.dill",
@@ -149,6 +153,7 @@
149153
],
150154
"dart2js_hostasserts_nnbd": [
151155
".packages",
156+
".dart_tool/package_config.json",
152157
"out/ReleaseX64NNBD/dart",
153158
"out/ReleaseX64NNBD/dart2js_platform.dill",
154159
"out/ReleaseX64NNBD/dart2js_platform_strong.dill",
@@ -187,6 +192,7 @@
187192
],
188193
"front-end": [
189194
".packages",
195+
".dart_tool/package_config.json",
190196
"out/ReleaseIA32/",
191197
"out/ReleaseX64/",
192198
"out/ReleaseX64NNBD/",
@@ -253,6 +259,7 @@
253259
"pkg/vm/",
254260
"runtime/",
255261
"sdk/",
262+
".dart_tool/package_config.json",
256263
".packages"
257264
],
258265
"vm-kernel": [
@@ -337,6 +344,7 @@
337344
"pkg/vm/",
338345
"runtime/",
339346
"sdk/",
347+
".dart_tool/package_config.json",
340348
".packages",
341349
".vpython"
342350
],
@@ -423,6 +431,7 @@
423431
"runtime/",
424432
"sdk/",
425433
"sdk_nnbd/",
434+
".dart_tool/package_config.json",
426435
".packages",
427436
".vpython"
428437
]

0 commit comments

Comments
 (0)