Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 9d279d4

Browse files
johnniwinthercommit-bot@chromium.org
authored andcommitted
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 <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 0341576 commit 9d279d4

File tree

2 files changed

+80
-15
lines changed

2 files changed

+80
-15
lines changed

.dart_tool/package_config.json

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"constraint, update this by running tools/generate_package_config.dart."
1212
],
1313
"configVersion": 2,
14-
"generated": "2020-07-14T07:50:57.318843",
14+
"generated": "2020-08-07T16:47:24.963156",
1515
"generator": "tools/generate_package_config.dart",
1616
"packages": [
1717
{
@@ -20,6 +20,41 @@
2020
"packageUri": "lib/",
2121
"languageVersion": "2.2"
2222
},
23+
{
24+
"name": "_fe_analyzer_shared_assigned_variables",
25+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables",
26+
"packageUri": ".nonexisting/"
27+
},
28+
{
29+
"name": "_fe_analyzer_shared_definite_assignment",
30+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment",
31+
"packageUri": ".nonexisting/"
32+
},
33+
{
34+
"name": "_fe_analyzer_shared_definite_unassignment",
35+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment",
36+
"packageUri": ".nonexisting/"
37+
},
38+
{
39+
"name": "_fe_analyzer_shared_inheritance",
40+
"rootUri": "../pkg/_fe_analyzer_shared/test/inheritance",
41+
"packageUri": ".nonexisting/"
42+
},
43+
{
44+
"name": "_fe_analyzer_shared_nullability",
45+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/nullability",
46+
"packageUri": ".nonexisting/"
47+
},
48+
{
49+
"name": "_fe_analyzer_shared_reachability",
50+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/reachability",
51+
"packageUri": ".nonexisting/"
52+
},
53+
{
54+
"name": "_fe_analyzer_shared_type_promotion",
55+
"rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion",
56+
"packageUri": ".nonexisting/"
57+
},
2358
{
2459
"name": "_js_interop_checks",
2560
"rootUri": "../pkg/_js_interop_checks",
@@ -48,7 +83,7 @@
4883
"name": "analyzer",
4984
"rootUri": "../pkg/analyzer",
5085
"packageUri": "lib/",
51-
"languageVersion": "2.6"
86+
"languageVersion": "2.7"
5287
},
5388
{
5489
"name": "analyzer_cli",
@@ -107,7 +142,7 @@
107142
"name": "charcode",
108143
"rootUri": "../third_party/pkg/charcode",
109144
"packageUri": "lib/",
110-
"languageVersion": "2.10"
145+
"languageVersion": "2.9"
111146
},
112147
{
113148
"name": "cli_util",
@@ -356,7 +391,6 @@
356391
{
357392
"name": "language_versioning_2.7_test",
358393
"rootUri": "../pkg/language_versioning_2.7_test",
359-
"packageUri": "lib/",
360394
"languageVersion": "2.7"
361395
},
362396
{
@@ -375,7 +409,7 @@
375409
"name": "markdown",
376410
"rootUri": "../third_party/pkg/markdown",
377411
"packageUri": "lib/",
378-
"languageVersion": "2.2"
412+
"languageVersion": "2.6"
379413
},
380414
{
381415
"name": "matcher",
@@ -566,7 +600,7 @@
566600
"name": "sse",
567601
"rootUri": "../third_party/pkg/sse",
568602
"packageUri": "lib/",
569-
"languageVersion": "2.6"
603+
"languageVersion": "2.2"
570604
},
571605
{
572606
"name": "stack_trace",
@@ -602,7 +636,7 @@
602636
"name": "sync_http",
603637
"rootUri": "../third_party/pkg/sync_http",
604638
"packageUri": "lib/",
605-
"languageVersion": "2.6"
639+
"languageVersion": "2.0"
606640
},
607641
{
608642
"name": "telemetry",
@@ -712,12 +746,6 @@
712746
"packageUri": "lib/",
713747
"languageVersion": "2.2"
714748
},
715-
{
716-
"name": "webdriver",
717-
"rootUri": "../third_party/pkg/webdriver",
718-
"packageUri": "lib/",
719-
"languageVersion": "2.6"
720-
},
721749
{
722750
"name": "web_components",
723751
"rootUri": "../third_party/pkg/web_components",
@@ -730,11 +758,17 @@
730758
"packageUri": "lib/",
731759
"languageVersion": "2.0"
732760
},
761+
{
762+
"name": "webdriver",
763+
"rootUri": "../third_party/pkg/webdriver",
764+
"packageUri": "lib/",
765+
"languageVersion": "2.0"
766+
},
733767
{
734768
"name": "yaml",
735769
"rootUri": "../third_party/pkg/yaml",
736770
"packageUri": "lib/",
737771
"languageVersion": "2.4"
738772
}
739773
]
740-
}
774+
}

tools/generate_package_config.dart

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,25 @@ void main(List<String> args) {
3434
packageDirectory('pkg/front_end/testcases/nonfunction_type_aliases/'),
3535
];
3636

37+
var feAnalyzerSharedPackageDirs = [
38+
packageDirectory(
39+
'pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables/'),
40+
packageDirectory(
41+
'pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment/'),
42+
packageDirectory(
43+
'pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment/'),
44+
packageDirectory('pkg/_fe_analyzer_shared/test/flow_analysis/nullability/'),
45+
packageDirectory(
46+
'pkg/_fe_analyzer_shared/test/flow_analysis/reachability/'),
47+
packageDirectory(
48+
'pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion/'),
49+
packageDirectory('pkg/_fe_analyzer_shared/test/inheritance/'),
50+
];
51+
3752
var packages = [
3853
...makePackageConfigs(packageDirs),
39-
...makeCfePackageConfigs(cfePackageDirs)
54+
...makeCfePackageConfigs(cfePackageDirs),
55+
...makeFeAnalyzerSharedPackageConfigs(feAnalyzerSharedPackageDirs)
4056
];
4157
packages.sort((a, b) => a["name"].compareTo(b["name"]));
4258

@@ -107,6 +123,21 @@ Iterable<Map<String, String>> makeCfePackageConfigs(
107123
}
108124
}
109125

126+
/// Generates package configurations for the special pseudo-packages used by
127+
/// the _fe_analyzer_shared id tests.
128+
Iterable<Map<String, String>> makeFeAnalyzerSharedPackageConfigs(
129+
List<String> packageDirs) sync* {
130+
for (var packageDir in packageDirs) {
131+
yield {
132+
'name': '_fe_analyzer_shared_${p.basename(packageDir)}',
133+
'rootUri': p
134+
.toUri(p.relative(packageDir, from: p.dirname(configFilePath)))
135+
.toString(),
136+
'packageUri': '.nonexisting/',
137+
};
138+
}
139+
}
140+
110141
/// Generates a path to [relativePath] within the repo.
111142
String packageDirectory(String relativePath) => p.join(repoRoot, relativePath);
112143

0 commit comments

Comments
 (0)