Add pseudo-packages for _fe_analyzer_shared test data folders

Change-Id: I6995cd65b547f0dc6159c90acb194babb819c4ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/156908
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
This commit is contained in:
Johnni Winther 2020-08-10 08:03:29 +00:00 committed by commit-bot@chromium.org
parent 0341576448
commit 9d279d41e3
2 changed files with 80 additions and 15 deletions

View file

@ -11,7 +11,7 @@
"constraint, update this by running tools/generate_package_config.dart."
],
"configVersion": 2,
"generated": "2020-07-14T07:50:57.318843",
"generated": "2020-08-07T16:47:24.963156",
"generator": "tools/generate_package_config.dart",
"packages": [
{
@ -20,6 +20,41 @@
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "_fe_analyzer_shared_assigned_variables",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_definite_assignment",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_definite_unassignment",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_inheritance",
"rootUri": "../pkg/_fe_analyzer_shared/test/inheritance",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_nullability",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/nullability",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_reachability",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/reachability",
"packageUri": ".nonexisting/"
},
{
"name": "_fe_analyzer_shared_type_promotion",
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion",
"packageUri": ".nonexisting/"
},
{
"name": "_js_interop_checks",
"rootUri": "../pkg/_js_interop_checks",
@ -48,7 +83,7 @@
"name": "analyzer",
"rootUri": "../pkg/analyzer",
"packageUri": "lib/",
"languageVersion": "2.6"
"languageVersion": "2.7"
},
{
"name": "analyzer_cli",
@ -107,7 +142,7 @@
"name": "charcode",
"rootUri": "../third_party/pkg/charcode",
"packageUri": "lib/",
"languageVersion": "2.10"
"languageVersion": "2.9"
},
{
"name": "cli_util",
@ -356,7 +391,6 @@
{
"name": "language_versioning_2.7_test",
"rootUri": "../pkg/language_versioning_2.7_test",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
@ -375,7 +409,7 @@
"name": "markdown",
"rootUri": "../third_party/pkg/markdown",
"packageUri": "lib/",
"languageVersion": "2.2"
"languageVersion": "2.6"
},
{
"name": "matcher",
@ -566,7 +600,7 @@
"name": "sse",
"rootUri": "../third_party/pkg/sse",
"packageUri": "lib/",
"languageVersion": "2.6"
"languageVersion": "2.2"
},
{
"name": "stack_trace",
@ -602,7 +636,7 @@
"name": "sync_http",
"rootUri": "../third_party/pkg/sync_http",
"packageUri": "lib/",
"languageVersion": "2.6"
"languageVersion": "2.0"
},
{
"name": "telemetry",
@ -712,12 +746,6 @@
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "webdriver",
"rootUri": "../third_party/pkg/webdriver",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "web_components",
"rootUri": "../third_party/pkg/web_components",
@ -730,6 +758,12 @@
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "webdriver",
"rootUri": "../third_party/pkg/webdriver",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "yaml",
"rootUri": "../third_party/pkg/yaml",
@ -737,4 +771,4 @@
"languageVersion": "2.4"
}
]
}
}

View file

@ -34,9 +34,25 @@ void main(List<String> args) {
packageDirectory('pkg/front_end/testcases/nonfunction_type_aliases/'),
];
var feAnalyzerSharedPackageDirs = [
packageDirectory(
'pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables/'),
packageDirectory(
'pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment/'),
packageDirectory(
'pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment/'),
packageDirectory('pkg/_fe_analyzer_shared/test/flow_analysis/nullability/'),
packageDirectory(
'pkg/_fe_analyzer_shared/test/flow_analysis/reachability/'),
packageDirectory(
'pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion/'),
packageDirectory('pkg/_fe_analyzer_shared/test/inheritance/'),
];
var packages = [
...makePackageConfigs(packageDirs),
...makeCfePackageConfigs(cfePackageDirs)
...makeCfePackageConfigs(cfePackageDirs),
...makeFeAnalyzerSharedPackageConfigs(feAnalyzerSharedPackageDirs)
];
packages.sort((a, b) => a["name"].compareTo(b["name"]));
@ -107,6 +123,21 @@ Iterable<Map<String, String>> makeCfePackageConfigs(
}
}
/// Generates package configurations for the special pseudo-packages used by
/// the _fe_analyzer_shared id tests.
Iterable<Map<String, String>> makeFeAnalyzerSharedPackageConfigs(
List<String> packageDirs) sync* {
for (var packageDir in packageDirs) {
yield {
'name': '_fe_analyzer_shared_${p.basename(packageDir)}',
'rootUri': p
.toUri(p.relative(packageDir, from: p.dirname(configFilePath)))
.toString(),
'packageUri': '.nonexisting/',
};
}
}
/// Generates a path to [relativePath] within the repo.
String packageDirectory(String relativePath) => p.join(repoRoot, relativePath);