Skip to content
Snippets Groups Projects
Commit 392544a9 authored by Natalie Weizenbaum's avatar Natalie Weizenbaum
Browse files

Mark Dartium and content shell as isDartVM.

Also rename TestPlatform.isDartVm to isDartVM to match the style guide
for two-letter acronyms.

R=kevmoo@google.com

Review URL: https://codereview.chromium.org//1269833003 .
parent 9dd5ed20
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
* Add a `Timeout.none` value indicating that a test should never time out. * Add a `Timeout.none` value indicating that a test should never time out.
* The `dart-vm` platform selector variable is now `true` for Dartium and content
shell.
## 0.12.3+8 ## 0.12.3+8
* Fix an uncaught error that could crop up when killing the test runner process * Fix an uncaught error that could crop up when killing the test runner process
......
...@@ -26,7 +26,7 @@ class Evaluator implements Visitor<bool> { ...@@ -26,7 +26,7 @@ class Evaluator implements Visitor<bool> {
if (node.name == _os.name) return true; if (node.name == _os.name) return true;
switch (node.name) { switch (node.name) {
case "dart-vm": return _platform.isDartVm; case "dart-vm": return _platform.isDartVM;
case "browser": return _platform.isBrowser; case "browser": return _platform.isBrowser;
case "js": return _platform.isJS; case "js": return _platform.isJS;
case "blink": return _platform.isBlink; case "blink": return _platform.isBlink;
......
...@@ -12,16 +12,16 @@ class TestPlatform { ...@@ -12,16 +12,16 @@ class TestPlatform {
/// The command-line Dart VM. /// The command-line Dart VM.
static const TestPlatform vm = static const TestPlatform vm =
const TestPlatform._("VM", "vm", isDartVm: true); const TestPlatform._("VM", "vm", isDartVM: true);
/// Dartium. /// Dartium.
static const TestPlatform dartium = const TestPlatform._("Dartium", "dartium", static const TestPlatform dartium = const TestPlatform._("Dartium", "dartium",
isBrowser: true, isBlink: true); isBrowser: true, isBlink: true, isDartVM: true);
/// Dartium content shell. /// Dartium content shell.
static const TestPlatform contentShell = const TestPlatform._( static const TestPlatform contentShell = const TestPlatform._(
"Dartium Content Shell", "content-shell", "Dartium Content Shell", "content-shell",
isBrowser: true, isBlink: true); isBrowser: true, isBlink: true, isDartVM: true);
/// Google Chrome. /// Google Chrome.
static const TestPlatform chrome = const TestPlatform._("Chrome", "chrome", static const TestPlatform chrome = const TestPlatform._("Chrome", "chrome",
...@@ -71,7 +71,7 @@ class TestPlatform { ...@@ -71,7 +71,7 @@ class TestPlatform {
final String identifier; final String identifier;
/// Whether this platform runs the Dart VM in any capacity. /// Whether this platform runs the Dart VM in any capacity.
final bool isDartVm; final bool isDartVM;
/// Whether this platform is a browser. /// Whether this platform is a browser.
final bool isBrowser; final bool isBrowser;
...@@ -82,7 +82,7 @@ class TestPlatform { ...@@ -82,7 +82,7 @@ class TestPlatform {
/// Whether this platform uses the Blink rendering engine. /// Whether this platform uses the Blink rendering engine.
final bool isBlink; final bool isBlink;
const TestPlatform._(this.name, this.identifier, {this.isDartVm: false, const TestPlatform._(this.name, this.identifier, {this.isDartVM: false,
this.isBrowser: false, this.isJS: false, this.isBlink: false}); this.isBrowser: false, this.isJS: false, this.isBlink: false});
String toString() => name; String toString() => name;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment