Skip to content

Commit 90cb9e4

Browse files
rmacnak-googleCommit Queue
authored andcommitted
[dartfuzz] Fix flag fuzzer after dart2wasm change that requires output have the wasm extension.
Change-Id: I9e89e6e91b5b279e5310e3fd3f51f5e3b6c6c1b7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/456108 Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Martin Kustermann <[email protected]>
1 parent a660116 commit 90cb9e4

File tree

3 files changed

+30
-9
lines changed

3 files changed

+30
-9
lines changed

runtime/tools/dartfuzz/flag_fuzzer.dart

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,14 @@ taskEnd() {
159159
}
160160
}
161161

162-
test(List<String> Function(String) createDartCommand, int taskIndex) async {
162+
test(
163+
List<String> Function(String) createDartCommand,
164+
int taskIndex,
165+
String extension,
166+
) async {
163167
taskStart();
164168

165-
var dartCommand = createDartCommand("out/dartfuzz/$taskIndex.js");
169+
var dartCommand = createDartCommand("out/dartfuzz/$taskIndex.$extension");
166170
var dartScript = dartCommand[0];
167171
var dartArguments = dartCommand.getRange(1, dartCommand.length).toList();
168172

@@ -177,7 +181,11 @@ test(List<String> Function(String) createDartCommand, int taskIndex) async {
177181
dartScript,
178182
...dartArguments,
179183
],
180-
["diff", "out/dartfuzz/expected.js", "out/dartfuzz/$taskIndex.js"],
184+
[
185+
"diff",
186+
"out/dartfuzz/expected.$extension",
187+
"out/dartfuzz/$taskIndex.$extension",
188+
],
181189
];
182190
} else {
183191
// AOT
@@ -203,7 +211,11 @@ test(List<String> Function(String) createDartCommand, int taskIndex) async {
203211
"out/dartfuzz/$taskIndex.elf",
204212
...dartArguments,
205213
],
206-
["diff", "out/dartfuzz/expected.js", "out/dartfuzz/$taskIndex.js"],
214+
[
215+
"diff",
216+
"out/dartfuzz/expected.$extension",
217+
"out/dartfuzz/$taskIndex.$extension",
218+
],
207219
];
208220
}
209221

@@ -254,19 +266,26 @@ test(List<String> Function(String) createDartCommand, int taskIndex) async {
254266
taskEnd();
255267
}
256268

257-
shard(List<String> Function(String) createDartCommand, int shardIndex) async {
269+
shard(
270+
List<String> Function(String) createDartCommand,
271+
int shardIndex,
272+
String extension,
273+
) async {
258274
while (!remainingTimeout.isNegative) {
259-
await test(createDartCommand, shardIndex);
275+
await test(createDartCommand, shardIndex, extension);
260276
}
261277
}
262278

263-
flagFuzz(List<String> Function(String) createDartCommand) async {
279+
flagFuzz(
280+
List<String> Function(String) createDartCommand,
281+
String extension,
282+
) async {
264283
stopwatch.start();
265284

266285
await Directory("out/dartfuzz").create();
267286

268287
var executable = "out/ReleaseX64/dart";
269-
var arguments = createDartCommand("out/dartfuzz/expected.js");
288+
var arguments = createDartCommand("out/dartfuzz/expected.$extension");
270289
var processResult = await Process.run(executable, arguments);
271290
if (processResult.exitCode != 0) {
272291
print("=== FAILURE ===");
@@ -280,6 +299,6 @@ flagFuzz(List<String> Function(String) createDartCommand) async {
280299
}
281300

282301
for (var i = 0; i < Platform.numberOfProcessors; i++) {
283-
shard(createDartCommand, i);
302+
shard(createDartCommand, i, extension);
284303
}
285304
}

runtime/tools/dartfuzz/flag_fuzzer_dart2js.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ main() => flagFuzz(
1616
"--no-source-maps", // Otherwise output includes path
1717
"pkg/compiler/lib/src/util/memory_compiler.dart",
1818
],
19+
"js",
1920
);

runtime/tools/dartfuzz/flag_fuzzer_dart2wasm.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ main() => flagFuzz(
1515
"pkg/compiler/lib/src/util/memory_compiler.dart",
1616
output,
1717
],
18+
"wasm",
1819
);

0 commit comments

Comments
 (0)