| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index 14669902daa209f3198e09d28cd37c9f9f2901cb..e5d1e733ca3d550bcdc25e56e4e57c9b0bb9861c 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -616,6 +616,9 @@ class StandardTestSuite implements TestSuite {
|
| '--browser=$runtime',
|
| '--timeout=${configuration["timeout"] - 2}',
|
| '--out=$htmlPath'];
|
| + if (runtime == 'dartium') {
|
| + args.add('--executable=$dartiumFilename');
|
| + }
|
| } else {
|
| args = [
|
| '$dartDir/tools/testing/drt-trampoline.py',
|
| @@ -775,12 +778,23 @@ class StandardTestSuite implements TestSuite {
|
| return configuration['drt'];
|
| }
|
| if (new Platform().operatingSystem() == 'macos') {
|
| - return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/' +
|
| + return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/'
|
| 'MacOS/DumpRenderTree';
|
| }
|
| return '$dartDir/client/tests/drt/DumpRenderTree';
|
| }
|
|
|
| + String get dartiumFilename() {
|
| + if (configuration['dartium'] != '') {
|
| + return configuration['dartium'];
|
| + }
|
| + if (new Platform().operatingSystem() == 'macos') {
|
| + return '$dartDir/client/tests/dartium/Chromium.app/Contents/'
|
| + 'MacOS/Chromium';
|
| + }
|
| + return '$dartDir/client/tests/dartium/chrome';
|
| + }
|
| +
|
| void testGeneratorStarted() {
|
| ++activeTestGenerators;
|
| }
|
|
|