| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index 80fc822033df6f5b8a65c6ecb0093790011524d8..14acd686640e3ee62fc96f67096236b7481ab928 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -330,6 +330,7 @@ class StandardTestSuite implements TestSuite {
|
| case 'dartium':
|
| case 'chromium':
|
| case 'frogium':
|
| + case 'frogsh':
|
| case 'legium':
|
| case 'webdriver':
|
| enqueueBrowserTest(filename, testName, optionsFromFile,
|
| @@ -587,6 +588,13 @@ class StandardTestSuite implements TestSuite {
|
| args.add(inputFile);
|
| // TODO(whesse): Add --fatal-type-errors if needed.
|
| break;
|
| + case 'frogsh':
|
| + args.clear();
|
| + args.add('--out=$outputFile');
|
| + args.add('--frogpad_js=' +
|
| + '${TestUtils.buildDir(configuration)}/frog/bin/frogpad.js');
|
| + args.add(inputFile);
|
| + break;
|
| case 'frogium':
|
| case 'legium':
|
| case 'webdriver':
|
| @@ -673,16 +681,18 @@ class StandardTestSuite implements TestSuite {
|
| }
|
|
|
| String get scriptType() {
|
| - switch (configuration['component']) {
|
| + String component = configuration['component'];
|
| + switch (component) {
|
| case 'dartium':
|
| return 'application/dart';
|
| case 'chromium':
|
| case 'frogium':
|
| + case 'frogsh':
|
| case 'legium':
|
| case 'webdriver':
|
| return 'text/javascript';
|
| default:
|
| - Expect.fail('Unimplemented component scriptType');
|
| + Expect.fail("Unexpected component '$component'");
|
| return null;
|
| }
|
| }
|
| @@ -1112,7 +1122,7 @@ class TestUtils {
|
| throw "Unknown compiler for: ${configuration['component']}";
|
| }
|
| }
|
| -
|
| +
|
| static String dartShellFileName(Map configuration) {
|
| var name = '${buildDir(configuration)}/${executableName(configuration)}';
|
| if (!(new File(name)).existsSync() && !configuration['list']) {
|
| @@ -1126,7 +1136,10 @@ class TestUtils {
|
| return null; // No separate compiler for dartium tests.
|
| }
|
| var name = configuration['frog'];
|
| - if (name == '') {
|
| + if (configuration['component'] == 'frogsh') {
|
| + name = '${dartDir()}/tools/testing/frogpad/frogpad.py';
|
| + }
|
| + if (name == '') {
|
| name = '${buildDir(configuration)}/${compilerName(configuration)}';
|
| }
|
| if (!(new File(name)).existsSync() && !configuration['list']) {
|
|
|