| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index 1933eeac85feb1656a05de5e9919d7cdce386e8c..487b33bd5b5c0b997ae1352e58832bfbd69e82a1 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -62,7 +62,7 @@ class CCTestSuite implements TestSuite {
|
| runnerPath = TestUtils.buildDir(configuration) + '/' + runnerName;
|
| }
|
|
|
| - void complexStatusMatching() => false;
|
| + bool complexStatusMatching() => false;
|
|
|
| void testNameHandler(String testName, ignore) {
|
| if (testName == "") {
|
| @@ -161,11 +161,11 @@ class StandardTestSuite implements TestSuite {
|
| List<String> this.statusFilePaths)
|
| : pathSeparator = new Platform().pathSeparator();
|
|
|
| - void isTestFile(String filename) => filename.endsWith("Test.dart");
|
| + bool isTestFile(String filename) => filename.endsWith("Test.dart");
|
|
|
| - void listRecursively() => false;
|
| + bool listRecursively() => false;
|
|
|
| - void complexStatusMatching() => false;
|
| + bool complexStatusMatching() => false;
|
|
|
| String shellPath() => TestUtils.dartShellFileName(configuration);
|
|
|
| @@ -508,19 +508,6 @@ class StandardTestSuite implements TestSuite {
|
| }
|
| }
|
|
|
| - String get scriptName() {
|
| - switch (configuration['component']) {
|
| - case 'dartium':
|
| - return tempDir.path + 'test.dart';
|
| - case 'chromium':
|
| - case 'frogium':
|
| - return tempDir.path + 'test.js';
|
| - default:
|
| - Expect.fail('Unimplemented component scriptType');
|
| - return null;
|
| - }
|
| - }
|
| -
|
| String getHtmlName(String filename) {
|
| return filename.replaceAll('/', '_') + configuration['component'] + '.html';
|
| }
|
| @@ -683,7 +670,7 @@ class DartcCompilationTestSuite extends StandardTestSuite {
|
| directoryPath,
|
| expectations);
|
|
|
| - void activityStarted() => ++activityCount;
|
| + void activityStarted() { ++activityCount; }
|
|
|
| void activityCompleted() {
|
| if (--activityCount == 0) {
|
| @@ -742,7 +729,7 @@ class JUnitTestSuite implements TestSuite {
|
| String this.directoryPath,
|
| String this.statusFilePath);
|
|
|
| - void isTestFile(String filename) => filename.endsWith("Tests.java") &&
|
| + bool isTestFile(String filename) => filename.endsWith("Tests.java") &&
|
| !filename.contains('com/google/dart/compiler/vm') &&
|
| !filename.contains('com/google/dart/corelib/SharedTests.java');
|
|
|
|
|