From 7edb1d713c036583e2ba3caf0df042835781a49c Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Tue, 6 Jul 2021 22:42:30 +0200 Subject: [PATCH] tests: parallelize test runs in wpt (#11306) --- tools/wpt.ts | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/wpt.ts b/tools/wpt.ts index f8ec3f517c..46829c0368 100755 --- a/tools/wpt.ts +++ b/tools/wpt.ts @@ -31,6 +31,7 @@ import { } from "./wpt/utils.ts"; import { blue, bold, green, red, yellow } from "../test_util/std/fmt/colors.ts"; import { writeAll, writeAllSync } from "../test_util/std/io/util.ts"; +import { pooledMap } from "../test_util/std/async/pool.ts"; import { saveExpectation } from "./wpt/utils.ts"; const command = Deno.args[0]; @@ -152,17 +153,29 @@ async function run() { console.log(`Going to run ${tests.length} test files.`); const results = await runWithTestUtil(false, async () => { - const results = []; + const results: { test: TestToRun; result: TestResult }[] = []; - for (const test of tests) { - console.log(`${blue("-".repeat(40))}\n${bold(test.path)}\n`); + const cores = Deno.systemCpuInfo().cores ?? 4; + const inParallel = !(cores === 1 || tests.length === 1); + + const iter = pooledMap(cores, tests, async (test) => { + if (!inParallel) { + console.log(`${blue("-".repeat(40))}\n${bold(test.path)}\n`); + } const result = await runSingleTest( test.url, test.options, - createReportTestCase(test.expectation), + inParallel ? () => {} : createReportTestCase(test.expectation), ); results.push({ test, result }); + if (inParallel) { + console.log(`${blue("-".repeat(40))}\n${bold(test.path)}\n`); + } reportVariation(result, test.expectation); + }); + + for await (const _ of iter) { + // do nothing } return results;