From 70de72a9e7ca976752e81c34ec84fbcbc83a916f Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Wed, 15 Mar 2023 22:04:08 +0000 Subject: [PATCH] [stable][dart2js] Update tests matrix entries - Update options for existing configurations. - Add one new configuration for running _2 test suites. - Rename builders and update to run new configurations. Tested: Tested with led runs. Issue: https://github.com/dart-lang/sdk/issues/51481 Cherry-pick: https://dart-review.googlesource.com/c/sdk/+/281348 Change-Id: I695525b0bfa936ad6c5c7f2ecac212299de969c2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287903 Reviewed-by: Alexander Thomas --- .../observatory_ui/observatory_ui.status | 3 + tools/bots/test_matrix.json | 420 +++++++----------- 2 files changed, 169 insertions(+), 254 deletions(-) diff --git a/runtime/observatory/tests/observatory_ui/observatory_ui.status b/runtime/observatory/tests/observatory_ui/observatory_ui.status index 10260fd494f3..dcba19c96de8 100644 --- a/runtime/observatory/tests/observatory_ui/observatory_ui.status +++ b/runtime/observatory/tests/observatory_ui/observatory_ui.status @@ -5,6 +5,9 @@ [ !$browser ] *: SkipByDesign +[ $compiler == dart2js && $runtime == chrome ] +*: Slow, Pass # https://github.com/dart-lang/sdk/issues/51651 + # custom elements are not supported on old browsers, we don't # intend for observatory to work on old browser versions, so # skipping. diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index b6a3b57ad239..34f00bf10aec 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -486,55 +486,44 @@ "timeout": 240 } }, - "dart2js-(linux|mac|win)-chrome": { + "dart2js-(linux|win)-chrome": { "options": { - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "nnbd": "strong", + "use-sdk": true } }, "dart2js-(linux|win)-firefox": { "options": { - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "nnbd": "strong", + "use-sdk": true } }, "dart2js-win-ie11": { "options": { "babel": "{\"presets\":[\"es2015\"]}", - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "nnbd": "strong", + "use-sdk": true } }, "dart2js-win-edge": { "options": { - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "nnbd": "strong", + "use-sdk": true } }, - "dart2js-mac-safari": { + "dart2js-mac-(chrome|safari)": { "options": { - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "architecture": "arm64", + "nnbd": "strong", + "use-sdk": true } }, "dart2js-minified-csp-linux-chrome": { "options": { - "minified": true, "csp": true, - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "minified": true, + "nnbd": "strong", + "use-sdk": true } }, "dart2js-minified-csp-max-fragments-linux-chrome": { @@ -552,10 +541,8 @@ "dart2js-minified-linux-d8": { "options": { "minified": true, - "use-sdk": true, - "dart2js-options": [ - "--no-sound-null-safety" - ] + "nnbd": "strong", + "use-sdk": true } }, "dart2js-minified-hostasserts-weak-max-fragments-linux-x64-d8": { @@ -574,40 +561,32 @@ "dart2js-production-linux-d8": { "options": { "builder-tag": "dart2js_production", - "use-sdk": true, "dart2js-options": [ - "-O3", - "--no-sound-null-safety" - ] + "-O3" + ], + "nnbd": "strong", + "use-sdk": true } }, "dart2js-o0-linux-d8": { "options": { "builder-tag": "dart2js_o0", - "use-sdk": true, "dart2js-options": [ - "-O0", - "--no-sound-null-safety" - ] + "-O0" + ], + "nnbd": "strong", + "use-sdk": true } }, - "dart2js-canary-linux-d8": { + "dart2js-canary-linux-(d8|chrome)": { "options": { "builder-tag": "dart2js_canary", - "host-checked": true, - "timeout": 240, "dart2js-options": [ "--canary" - ] - } - }, - "dart2js-canary-linux-chrome": { - "options": { + ], "host-checked": true, - "timeout": 240, - "dart2js-options": [ - "--canary" - ] + "nnbd": "strong", + "timeout": 240 } }, "dart2js-hostasserts-linux-ia32-d8": { @@ -622,24 +601,31 @@ "dart2js-hostasserts-linux-d8": { "options": { "host-checked": true, + "nnbd": "strong", "timeout": 240 } }, "dart2js-hostasserts-weak-linux-x64-(d8|chrome)": { "options": { "host-checked": true, - "timeout": 240, + "timeout": 241, "builder-tag": "dart2js-weak" } }, "dart2js-hostasserts-linux-(d8|chrome)-unsound": { "options": { - "host-checked": true, - "timeout": 240, "builder-tag": "dart2js-weak", - "dart2js-options": [ - "--no-sound-null-safety" - ] + "host-checked": true, + "nnbd": "weak", + "timeout": 240 + } + }, + "dart2js-hostasserts-linux-(d8|chrome)-unsound_2": { + "options": { + "builder-tag": "legacy-test-suites", + "host-checked": true, + "nnbd": "weak", + "timeout": 240 } }, "dart2js-hostasserts-weak-max-fragments-linux-x64-d8": { @@ -655,12 +641,13 @@ }, "dart2js-hostasserts-minified-fragments-linux-d8": { "options": { - "host-checked": true, - "timeout": 240, "dart2js-options": [ "--merge-fragments-threshold=3", "--simple-load-ids" - ] + ], + "host-checked": true, + "nnbd": "strong", + "timeout": 240 } }, "dart2js-hostasserts-strong-linux-x64-(d8|chrome)": { @@ -3026,10 +3013,10 @@ }, { "builders": [ - "dart2js-canary-x64" + "dart2js-canary-linux" ], "meta": { - "description": "dart2js canary tests." + "description": "dart2js canary mode tests." }, "steps": [ { @@ -3041,36 +3028,28 @@ ] }, { - "name": "dart2js canary d8 tests", + "name": "dart2js d8 tests", "arguments": [ "-ndart2js-canary-linux-d8", - "language", "corelib", + "language", "web" ], "shards": 6, "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js canary chrome tests", + "name": "dart2js chrome tests", "arguments": [ "-ndart2js-canary-linux-chrome", + "lib", "web" ], "shards": 3, "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js canary lib tests", - "arguments": [ - "-ndart2js-canary-linux-chrome", - "lib" - ], - "shards": 3, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js canary co19 tests", + "name": "dart2js chrome co19 tests", "arguments": [ "-ndart2js-canary-linux-chrome", "co19" @@ -3137,10 +3116,10 @@ }, { "builders": [ - "dart2js-strong-hostasserts-linux-ia32-d8" + "dart2js-hostasserts-linux-d8" ], "meta": { - "description": "dart2js-d8 tests with assertions during compilation" + "description": "dart2js tests with assertions during compilation" }, "steps": [ { @@ -3153,50 +3132,36 @@ { "name": "dart2js tests", "arguments": [ - "-ndart2js-hostasserts-linux-ia32-d8", - "--exclude-suite=observatory_ui" + "-ndart2js-hostasserts-linux-d8", + "corelib", + "language", + "lib", + "pkg", + "web" ], "shards": 6, - "fileset": "web_platform_hostasserts" + "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js co19_2 tests", + "name": "dart2js co19 tests", "arguments": [ - "-ndart2js-hostasserts-linux-ia32-d8", - "co19_2" + "-ndart2js-hostasserts-linux-d8", + "co19" ], "shards": 6, - "fileset": "web_platform_hostasserts" - }, - { - "name": "dart2js package tests", - "arguments": [ - "-ndart2js-hostasserts-linux-ia32-d8", - "pkg" - ] - }, - { - "name": "dart2js extra tests", - "arguments": [ - "-ndart2js-hostasserts-linux-ia32-d8", - "web_2" - ] + "fileset": "web_platform_hostasserts_nnbd" } ] }, { "builders": [ - "dart2js-strong-linux-x64-chrome", - "dart2js-strong-linux-x64-firefox", - "dart2js-strong-mac-x64-chrome", - "dart2js-strong-mac-x64-safari", - "dart2js-strong-win-x64-chrome", - "dart2js-strong-win-x64-edge", - "dart2js-strong-win-x64-firefox", - "dart2js-strong-win-x64-ie11" + "dart2js-linux-chrome", + "dart2js-linux-firefox", + "dart2js-win-chrome", + "dart2js-win-firefox" ], "meta": { - "description": "dart2js browser tests for Dart 2.0." + "description": "dart2js browser tests" }, "steps": [ { @@ -3210,46 +3175,75 @@ "name": "dart2js tests", "arguments": [ "-ndart2js-${system}-${runtime}", - "--reset-browser-configuration", - "--exclude-suite=observatory_ui" + "corelib", + "language", + "lib", + "pkg", + "web" ], "shards": 6, - "fileset": "web_platform" + "fileset": "web_platform_nnbd" }, { - "name": "dart2js co19_2 tests", + "name": "dart2js co19 tests", "arguments": [ "-ndart2js-${system}-${runtime}", - "--reset-browser-configuration", - "co19_2" + "co19" ], "shards": 6, - "fileset": "web_platform" + "fileset": "web_platform_nnbd" + } + ] + }, + { + "builders": [ + "dart2js-mac-chrome", + "dart2js-mac-safari" + ], + "meta": { + "description": "dart2js browser tests" + }, + "steps": [ + { + "name": "build dart", + "script": "tools/build.py", + "arguments": [ + "--arch=arm64", + "create_sdk" + ] }, { - "name": "dart2js package tests", + "name": "dart2js tests", "arguments": [ "-ndart2js-${system}-${runtime}", - "--reset-browser-configuration", - "pkg" - ] + "--arch=arm64", + "corelib", + "language", + "lib", + "pkg", + "web" + ], + "shards": 6, + "fileset": "web_platform_nnbd" }, { - "name": "dart2js extra tests", + "name": "dart2js co19 tests", "arguments": [ "-ndart2js-${system}-${runtime}", - "--reset-browser-configuration", - "web_2" - ] + "--arch=arm64", + "co19" + ], + "shards": 6, + "fileset": "web_platform_nnbd" } ] }, { "builders": [ - "dart2js-minified-strong-linux-x64-d8" + "dart2js-minified-linux-d8" ], "meta": { - "description": "dart2js tests for Dart 2.0." + "description": "dart2js minified d8 tests" }, "steps": [ { @@ -3263,62 +3257,47 @@ "name": "dart2js tests", "arguments": [ "-ndart2js-minified-linux-d8", - "--exclude-suite=observatory_ui" + "corelib", + "language", + "lib", + "pkg", + "web" ], "shards": 6, - "fileset": "web_platform" - }, - { - "name": "dart2js package tests", - "arguments": [ - "-ndart2js-minified-linux-d8", - "pkg" - ] - }, - { - "name": "dart2js extra tests", - "arguments": [ - "-ndart2js-minified-linux-d8", - "web_2" - ] + "fileset": "web_platform_nnbd" }, { "name": "dart2js production tests", "arguments": [ "-ndart2js-production-linux-d8", - "--exclude-suite=observatory_ui" + "corelib", + "language", + "lib", + "pkg", + "web" ], "shards": 6, - "fileset": "web_platform" - }, - { - "name": "dart2js production extra tests", - "arguments": [ - "-ndart2js-production-linux-d8", - "web_2" - ] + "fileset": "web_platform_nnbd" }, { "name": "dart2js -O0 smoke tests", "arguments": [ "-ndart2js-o0-linux-d8", - "web_2" + "web" ] }, { - "name": "dart2js d8 fragment merging tests", + "name": "dart2js hostasserts fragment merging tests", "arguments": [ - "-ndart2js-minified-hostasserts-weak-max-fragments-linux-x64-d8", + "-ndart2js-hostasserts-minified-fragments-linux-d8", "web/deferred/" - ], - "shards": 1, - "fileset": "web_platform_hostasserts" + ] } ] }, { "builders": [ - "dart2js-csp-minified-linux-x64-chrome" + "dart2js-minified-csp-linux-chrome" ], "meta": { "description": "dart2js tests in csp and minified mode." @@ -3335,50 +3314,24 @@ "name": "dart2js tests", "arguments": [ "-ndart2js-minified-csp-linux-chrome", - "--reset-browser-configuration", - "--exclude-suite=observatory_ui" + "corelib", + "language", + "lib", + "observatory_ui", + "pkg", + "web" ], - "shards": 4, - "fileset": "web_platform" - }, - { - "name": "dart2js package tests", - "arguments": [ - "-ndart2js-minified-csp-linux-chrome", - "--reset-browser-configuration", - "pkg" - ] - }, - { - "name": "dart2js observatory-ui tests", - "arguments": [ - "-ndart2js-minified-csp-linux-chrome", - "--reset-browser-configuration", - "observatory_ui" - ] - }, - { - "name": "dart2js extra tests", - "arguments": [ - "-ndart2js-minified-csp-linux-chrome", - "web_2" - ] - }, - { - "name": "dart2js d8 fragment merging tests", - "arguments": [ - "-ndart2js-minified-csp-max-fragments-linux-chrome", - "web/deferred/" - ] + "shards": 6, + "fileset": "web_platform_nnbd" } ] }, { "builders": [ - "dart2js-nnbd-linux-x64-chrome" + "dart2js-hostasserts-linux-unsound" ], "meta": { - "description": "dart2js tests for NNBD." + "description": "dart2js unsound tests with assertions during compilation" }, "steps": [ { @@ -3390,96 +3343,55 @@ ] }, { - "name": "dart2js nnbd weak d8 tests", + "name": "dart2js d8 tests", "arguments": [ - "-ndart2js-hostasserts-weak-linux-x64-d8", - "language", - "corelib" + "-ndart2js-hostasserts-linux-d8-unsound", + "corelib", + "language" ], "shards": 6, "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js nnbd weak d8 fragment merging tests", - "arguments": [ - "-ndart2js-hostasserts-weak-max-fragments-linux-x64-d8", - "web/deferred/" - ], - "shards": 1, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js nnbd weak chrome tests", + "name": "dart2js chrome tests", "arguments": [ - "-ndart2js-hostasserts-weak-linux-x64-chrome", + "-ndart2js-hostasserts-linux-chrome-unsound", + "lib", + "pkg", "web" ], "shards": 3, "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js nnbd weak lib tests", + "name": "dart2js chrome co19 tests", "arguments": [ - "-ndart2js-hostasserts-weak-linux-x64-chrome", - "lib" - ], - "shards": 3, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js nnbd weak co19 tests", - "arguments": [ - "-ndart2js-hostasserts-weak-linux-x64-chrome", + "-ndart2js-hostasserts-linux-chrome-unsound", "co19" ], "shards": 6, "fileset": "web_platform_hostasserts_nnbd" }, { - "name": "dart2js nnbd strong d8 tests", + "name": "dart2js chrome _2 tests", "arguments": [ - "-ndart2js-hostasserts-strong-linux-x64-d8", - "language", - "corelib" + "-ndart2js-hostasserts-linux-chrome-unsound_2", + "corelib_2", + "language_2", + "lib_2", + "web_2" ], "shards": 6, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js nnbd strong d8 fragment merging tests", - "arguments": [ - "-ndart2js-hostasserts-strong-max-fragments-linux-x64-d8", - "web/deferred/" - ], - "shards": 1, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js nnbd strong chrome tests", - "arguments": [ - "-ndart2js-hostasserts-strong-linux-x64-chrome", - "web" - ], - "shards": 3, - "fileset": "web_platform_hostasserts_nnbd" - }, - { - "name": "dart2js nnbd strong lib tests", - "arguments": [ - "-ndart2js-hostasserts-strong-linux-x64-chrome", - "lib" - ], - "shards": 3, - "fileset": "web_platform_hostasserts_nnbd" + "fileset": "web_platform_hostasserts" }, { - "name": "dart2js nnbd strong co19 tests", + "name": "dart2js chrome co19_2 tests", "arguments": [ - "-ndart2js-hostasserts-strong-linux-x64-chrome", - "co19" + "-ndart2js-hostasserts-linux-chrome-unsound_2", + "co19_2" ], "shards": 6, - "fileset": "web_platform_hostasserts_nnbd" + "fileset": "web_platform_hostasserts" } ] },