diff --git a/tools/bots/README.md b/tools/bots/README.md index f52e565af5d..c9903a0daf1 100644 --- a/tools/bots/README.md +++ b/tools/bots/README.md @@ -89,7 +89,7 @@ Inside arguments, the following variables will be expanded to values extracted from the builder name: - `${mode}`: the mode in which to run the tests; e.g., `release`, `debug` - `${arch}`: architecture to run the tests on; e.g., `ia32`, `x64` -- `$[system}`: the system on which to run the tests; e.g., `win`, `linux`, `mac` +- `${system}`: the system on which to run the tests; e.g., `win`, `linux`, `mac` - `${runtime}`: the runtime to use to run the tests; e.g., `vm`, `chrome`, `d8` ```json @@ -135,7 +135,7 @@ Parsing of builder names is done in [1]. A name like "front-end-nnbd-win-release-x64" is parsed into variables: - `info`: `"front-end-nnbd"` -- `os`: `"win"` +- `system`: `"win"` - `mode`: `"release"` - `arch`: `"x64"` diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index b4bf618a4f9..7cee52e4b5b 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -476,7 +476,7 @@ "timeout": 120 } }, - "dart2wasm-asserts-(linux|mac|win)-minify-(d8|jsshell|jsc|chrome|firefox)": { + "dart2wasm-asserts-minified-(linux|mac|win)-(d8|jsshell|jsc|chrome|firefox)": { "options": { "dart2wasm-options": [ "--minify" @@ -2728,7 +2728,7 @@ { "name": "dart2wasm tests", "arguments": [ - "-ndart2wasm-asserts-linux-${runtime}", + "-ndart2wasm-asserts-${system}-${runtime}", "co19", "corelib", "language", @@ -2766,7 +2766,7 @@ "testRunner": true, "arguments": [ "pkg/dynamic_modules/test/runner/main.dart", - "-ndart2wasm-linux-${runtime}", + "-ndart2wasm-${system}-${runtime}", "-rdart2wasm", "--verbose" ] @@ -2774,7 +2774,51 @@ { "name": "dart2wasm tests", "arguments": [ - "-ndart2wasm-linux-${runtime}", + "-ndart2wasm-${system}-${runtime}", + "co19", + "corelib", + "language", + "lib", + "web" + ], + "shards": 8, + "fileset": "dart2wasm_hostasserts" + } + ] + }, + { + "builders": [ + "dart2wasm-asserts-minified-linux-d8" + ], + "meta": { + "description": "dart2wasm minified tests" + }, + "steps": [ + { + "name": "build dart", + "script": "tools/build.py", + "arguments": [ + "runtime", + "dart2wasm", + "create_sdk", + "dartaotruntime" + ] + }, + { + "name": "dart2wasm dynamic modules", + "script": "out/ReleaseX64/dart", + "testRunner": true, + "arguments": [ + "pkg/dynamic_modules/test/runner/main.dart", + "-ndart2wasm-asserts-minified-${system}-${runtime}", + "-rdart2wasm", + "--verbose" + ] + }, + { + "name": "dart2wasm tests", + "arguments": [ + "-ndart2wasm-asserts-minified-${system}-${runtime}", "co19", "corelib", "language", @@ -2807,7 +2851,7 @@ { "name": "dart2wasm tests", "arguments": [ - "-ndart2wasm-linux-optimized-${runtime}", + "-ndart2wasm-${system}-optimized-${runtime}", "co19", "corelib", "language", @@ -2840,7 +2884,7 @@ { "name": "dart2wasm tests", "arguments": [ - "-ndart2wasm-linux-jscm-${runtime}", + "-ndart2wasm-${system}-jscm-${runtime}", "co19", "corelib", "language",