[testing] Simplify analyzer configurations
Bug: b/237755665
Cq-Include-Trybots: luci.dart.try:analyzer-linux-release-try,analyzer-mac-release-try,analyzer-win-release-try
Change-Id: Ia48331d6fd6bf00df9dbe1b895e157a0957064f2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/249608
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart
index e9bf880..adf5008 100644
--- a/pkg/test_runner/lib/src/configuration.dart
+++ b/pkg/test_runner/lib/src/configuration.dart
@@ -333,16 +333,19 @@
_compilerConfiguration ??= CompilerConfiguration(this);
/// The set of [Feature]s supported by this configuration.
- late final Set<Feature> supportedFeatures = {
- // TODO(rnystrom): Define more features for things like "dart:io", separate
- // int/double representation, etc.
- if (NnbdMode.legacy == configuration.nnbdMode)
- Feature.nnbdLegacy
- else
- Feature.nnbd,
- if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
- if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
- };
+ late final Set<Feature> supportedFeatures = compiler == Compiler.dart2analyzer
+ // The analyzer should parse all tests.
+ ? {...Feature.all}
+ : {
+ // TODO(rnystrom): Define more features for things like "dart:io", separate
+ // int/double representation, etc.
+ if (NnbdMode.legacy == configuration.nnbdMode)
+ Feature.nnbdLegacy
+ else
+ Feature.nnbd,
+ if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
+ if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
+ };
/// Determines if this configuration has a compatible compiler and runtime
/// and other valid fields.
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index c47ad38..15cb7565 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -979,20 +979,6 @@
"enable-asserts": true,
"use-sdk": true
}
- },
- "analyzer-asserts-strong-(linux|mac|win)": {
- "options": {
- "compiler": "dart2analyzer",
- "enable-asserts": true,
- "use-sdk": true
- }
- },
- "analyzer-asserts-weak-(linux|mac|win)": {
- "options": {
- "compiler": "dart2analyzer",
- "enable-asserts": true,
- "use-sdk": true
- }
}
},
"builder_configurations": [
@@ -3298,12 +3284,32 @@
"fileset": "analyzer_unit_tests"
},
{
+ "name": "nnbd_migration unit tests",
+ "arguments": [
+ "-nanalyzer-unittest-asserts-${mode}-${system}",
+ "pkg/nnbd_migration"
+ ],
+ "shards": 2,
+ "fileset": "analyzer_unit_tests"
+ },
+ {
"name": "analyze tests enable-asserts",
"arguments": [
"-nanalyzer-asserts-${system}"
]
},
{
+ "name": "analyze migrated tests enable-asserts",
+ "arguments": [
+ "-nanalyzer-asserts-${system}",
+ "corelib",
+ "ffi",
+ "language",
+ "lib",
+ "standalone"
+ ]
+ },
+ {
"name": "analyze pkg tests enable-asserts",
"arguments": [
"-nanalyzer-asserts-${system}",
@@ -3325,18 +3331,10 @@
]
},
{
- "name": "nnbd_migration unit tests",
- "arguments": [
- "-nanalyzer-unittest-asserts-${mode}-${system}",
- "pkg/nnbd_migration"
- ],
- "shards": 2,
- "fileset": "analyzer_unit_tests"
- },
- {
- "name": "analyze tests co19_2",
+ "name": "analyze co19 tests",
"arguments": [
"-nanalyzer-asserts-${system}",
+ "co19",
"co19_2"
]
}
@@ -3344,62 +3342,6 @@
},
{
"builders": [
- "analyzer-nnbd-linux-release",
- "analyzer-nnbd-mac-release",
- "analyzer-nnbd-win-release"
- ],
- "meta": {
- "description": "This configuration is used by the nnbd analyzer builders."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": [
- "create_sdk"
- ]
- },
- {
- "name": "analyze nnbd strong tests enable-asserts",
- "arguments": [
- "-nanalyzer-asserts-strong-${system}",
- "corelib",
- "ffi",
- "language",
- "lib",
- "standalone"
- ]
- },
- {
- "name": "analyze nnbd weak tests enable-asserts",
- "arguments": [
- "-nanalyzer-asserts-weak-${system}",
- "corelib",
- "ffi",
- "language",
- "lib",
- "service",
- "standalone"
- ]
- },
- {
- "name": "analyze nnbd strong co19 tests",
- "arguments": [
- "-nanalyzer-asserts-strong-${system}",
- "co19"
- ]
- },
- {
- "name": "analyze nnbd weak co19 tests",
- "arguments": [
- "-nanalyzer-asserts-weak-${system}",
- "co19"
- ]
- }
- ]
- },
- {
- "builders": [
"analyzer-analysis-server-linux"
],
"meta": {
