diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd0cd62e34b415de21e5e6c222a5a550181b5eb..597930ffeaffc7f39ff45da314a90664fc871d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ * 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 * Fix an uncaught error that could crop up when killing the test runner process diff --git a/lib/src/backend/platform_selector/evaluator.dart b/lib/src/backend/platform_selector/evaluator.dart index 3f61fcc34758d7fe379411d80e5cee3195ac7ebb..7078e18fc8b433025c5b35bf167771982bac1653 100644 --- a/lib/src/backend/platform_selector/evaluator.dart +++ b/lib/src/backend/platform_selector/evaluator.dart @@ -26,7 +26,7 @@ class Evaluator implements Visitor<bool> { if (node.name == _os.name) return true; switch (node.name) { - case "dart-vm": return _platform.isDartVm; + case "dart-vm": return _platform.isDartVM; case "browser": return _platform.isBrowser; case "js": return _platform.isJS; case "blink": return _platform.isBlink; diff --git a/lib/src/backend/test_platform.dart b/lib/src/backend/test_platform.dart index fef5a62491c0d73a900fb54f269eb033ef689b98..e304821a3f82829a21cd383451ceafb2c39be3ae 100644 --- a/lib/src/backend/test_platform.dart +++ b/lib/src/backend/test_platform.dart @@ -12,16 +12,16 @@ class TestPlatform { /// The command-line Dart VM. static const TestPlatform vm = - const TestPlatform._("VM", "vm", isDartVm: true); + const TestPlatform._("VM", "vm", isDartVM: true); /// Dartium. static const TestPlatform dartium = const TestPlatform._("Dartium", "dartium", - isBrowser: true, isBlink: true); + isBrowser: true, isBlink: true, isDartVM: true); /// Dartium content shell. static const TestPlatform contentShell = const TestPlatform._( "Dartium Content Shell", "content-shell", - isBrowser: true, isBlink: true); + isBrowser: true, isBlink: true, isDartVM: true); /// Google Chrome. static const TestPlatform chrome = const TestPlatform._("Chrome", "chrome", @@ -71,7 +71,7 @@ class TestPlatform { final String identifier; /// Whether this platform runs the Dart VM in any capacity. - final bool isDartVm; + final bool isDartVM; /// Whether this platform is a browser. final bool isBrowser; @@ -82,7 +82,7 @@ class TestPlatform { /// Whether this platform uses the Blink rendering engine. 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}); String toString() => name;