[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>
This commit is contained in:
Alexander Thomas 2022-07-01 16:16:42 +00:00 committed by Commit Bot
parent 0f2e021da8
commit 81d86a05b2
2 changed files with 35 additions and 90 deletions

View file

@ -333,16 +333,19 @@ class TestConfiguration {
_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.

View file

@ -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": [
@ -3297,12 +3283,32 @@
"shards": 2,
"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": [
@ -3325,79 +3331,15 @@
]
},
{
"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"
]
}
]
},
{
"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"