Get the observatory tests correctly opting out of sound null safety.
Fix #43881.
Change-Id: Iebb3ac501f09a4eb6220d5232ff71514938f7e10
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/169255
Auto-Submit: Bob Nystrom <rnystrom@google.com>
Commit-Queue: Leaf Petersen <leafp@google.com>
Reviewed-by: Leaf Petersen <leafp@google.com>
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 4490eea..e78a878 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -510,6 +510,12 @@
"use-sdk": true
}
},
+ "dart2js-(linux|mac|win)-chrome-unsound": {
+ "options": {
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-weak-(linux|mac|win)-x64-d8": {
"options": {
"builder-tag": "dart2js-weak",
@@ -521,22 +527,47 @@
"use-sdk": true
}
},
+ "dart2js-(linux|win)-firefox-unsound": {
+ "options": {
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-win-ie11": {
"options": {
"use-sdk": true,
"babel": "{\"presets\":[\"es2015\"]}"
}
},
+ "dart2js-win-ie11-unsound": {
+ "options": {
+ "use-sdk": true,
+ "babel": "{\"presets\":[\"es2015\"]}",
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-win-edge": {
"options": {
"use-sdk": true
}
},
+ "dart2js-win-edge-unsound": {
+ "options": {
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-mac-safari": {
"options": {
"use-sdk": true
}
},
+ "dart2js-mac-safari-unsound": {
+ "options": {
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-minified-csp-(linux|mac|win)-chrome": {
"options": {
"minified": true,
@@ -544,12 +575,27 @@
"use-sdk": true
}
},
+ "dart2js-minified-csp-(linux|mac|win)-chrome-unsound": {
+ "options": {
+ "minified": true,
+ "csp": true,
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-minified-(linux|mac|win)-d8": {
"options": {
"minified": true,
"use-sdk": true
}
},
+ "dart2js-minified-(linux|mac|win)-d8-unsound": {
+ "options": {
+ "minified": true,
+ "use-sdk": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-production-(linux|mac|win)-d8": {
"options": {
"builder-tag": "dart2js_production",
@@ -564,6 +610,12 @@
"host-checked": true
}
},
+ "dart2js-hostasserts-(linux|mac|win)-(ia32|x64)-d8-unsound": {
+ "options": {
+ "host-checked": true,
+ "dart2js-options": ["--no-sound-null-safety"]
+ }
+ },
"dart2js-hostasserts-weak-(linux|win)-x64-(d8|chrome)": {
"options": {
"builder-tag": "dart2js-weak",
@@ -2139,10 +2191,9 @@
{
"name": "dart2js observatory-ui tests",
"arguments": [
- "-ndart2js-hostasserts-linux-ia32-d8",
+ "-ndart2js-hostasserts-linux-ia32-d8-unsound",
"--dart2js-batch",
"--enable-experiment=non-nullable",
- "--dart2js-options=--no-sound-null-safety",
"observatory_ui"
]
},
@@ -2212,11 +2263,10 @@
{
"name": "dart2js observatory-ui tests",
"arguments": [
- "-ndart2js-${system}-${runtime}",
+ "-ndart2js-${system}-${runtime}-unsound",
"--dart2js-batch",
"--reset-browser-configuration",
"--enable-experiment=non-nullable",
- "--dart2js-options=--no-sound-null-safety",
"observatory_ui"
]
},
@@ -2267,10 +2317,9 @@
{
"name": "dart2js observatory-ui tests",
"arguments": [
- "-ndart2js-minified-linux-d8",
+ "-ndart2js-minified-linux-d8-unsound",
"--dart2js-batch",
"--enable-experiment=non-nullable",
- "--dart2js-options=--no-sound-null-safety",
"observatory_ui"
]
},
@@ -2340,11 +2389,10 @@
{
"name": "dart2js observatory-ui tests",
"arguments": [
- "-ndart2js-minified-csp-linux-chrome",
+ "-ndart2js-minified-csp-linux-chrome-unsound",
"--dart2js-batch",
"--reset-browser-configuration",
"--enable-experiment=non-nullable",
- "--dart2js-options=--no-sound-null-safety",
"observatory_ui"
]
},