Skip to content

Commit bf5690d

Browse files
MarkzipanCommit Bot
authored andcommitted
[dart2js] Removing size checks from main output unit dump info tests
These were far too sensitive to code size changes and causing unhelpful failures. Change-Id: I5293c7d281a5db2d36af35f67966f4d47413a78a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243561 Reviewed-by: Joshua Litt <joshualitt@google.com> Commit-Queue: Mark Zhou <markzipan@google.com>
1 parent ce591d1 commit bf5690d

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

pkg/compiler/test/dump_info/data/closures.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"id": "outputUnit/main",
6363
"kind": "outputUnit",
6464
"name": "main",
65-
"size": 107495,
6665
"filename": "out",
6766
"imports": []
6867
}]

pkg/compiler/test/dump_info/data/deferred/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
"id": "outputUnit/main",
115115
"kind": "outputUnit",
116116
"name": "main",
117-
"size": 183730,
118117
"filename": "out",
119118
"imports": []
120119
}]

pkg/compiler/test/dump_info/data/deferred_future/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
"id": "outputUnit/main",
121121
"kind": "outputUnit",
122122
"name": "main",
123-
"size": 190176,
124123
"filename": "out",
125124
"imports": []
126125
}]

pkg/compiler/test/dump_info/data/js_members.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
"id": "outputUnit/main",
139139
"kind": "outputUnit",
140140
"name": "main",
141-
"size": 112396,
142141
"filename": "out",
143142
"imports": []
144143
}]

pkg/compiler/test/dump_info/data/members.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
"id": "outputUnit/main",
7878
"kind": "outputUnit",
7979
"name": "main",
80-
"size": 91101,
8180
"filename": "out",
8281
"imports": []
8382
}]

pkg/compiler/test/dump_info/dump_info_test.dart

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,23 @@ import '../equivalence/id_equivalence_helper.dart';
2222
final JsonEncoder encoder = const JsonEncoder();
2323
final JsonEncoder indentedEncoder = const JsonEncoder.withIndent(' ');
2424

25-
String jsonEncode(object, {bool indent = true}) {
25+
String jsonEncode(Map object, {bool indent = true}) {
2626
var jsonEncoder = indent ? indentedEncoder : encoder;
2727
// Filter block comments since they interfere with ID test comments.
2828
var json =
2929
jsonEncoder.convert(object).replaceAll('/*', '').replaceAll('*/', '');
3030
return json;
3131
}
3232

33+
Map filteredJsonObject(Map object, Set<String> filteredFields) {
34+
Map filteredObject = {};
35+
object.forEach((key, value) {
36+
if (filteredFields.contains(key)) return;
37+
filteredObject[key] = value;
38+
});
39+
return filteredObject;
40+
}
41+
3342
main(List<String> args) {
3443
asyncTest(() async {
3544
Directory dataDir = Directory.fromUri(Platform.script.resolve('data'));
@@ -85,8 +94,13 @@ class DumpInfoDataComputer extends DataComputer<Features> {
8594
features.addElement(
8695
Tags.dependencies, jsonEncode(dumpInfoState.info.dependencies));
8796
for (final outputUnit in dumpInfoState.info.outputUnits) {
88-
features.addElement(
89-
Tags.outputUnits, jsonEncode(outputUnit.accept(converter)));
97+
var outputUnitJsonObject = outputUnit.accept(converter);
98+
// Remove the size from the main output unit due to high noise ratio.
99+
if (outputUnit.name == 'main') {
100+
outputUnitJsonObject =
101+
filteredJsonObject(outputUnitJsonObject, {'size'});
102+
}
103+
features.addElement(Tags.outputUnits, jsonEncode(outputUnitJsonObject));
90104
}
91105
features.addElement(
92106
Tags.deferredFiles, jsonEncode(dumpInfoState.info.deferredFiles));

0 commit comments

Comments
 (0)