| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index c87b448ca04c6f28fcaf260ef927031a0750db99..dceb552557f93a73eb352677edcfa56bf2cda3c1 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -384,8 +384,8 @@ class StandardTestSuite implements TestSuite {
|
| } else {
|
| testName = filename;
|
| }
|
| - String suffix = TestUtils.executableSuffix(configuration['compiler']);
|
| - if (configuration['compiler'] != 'dart_analyzer$suffix' ||
|
| +
|
| + if (configuration['compiler'] != 'dartc' ||
|
| testName.endsWith('_test.dart')) {
|
| if (testName.endsWith('.dart')) {
|
| testName = testName.substring(0, testName.length - 5);
|
| @@ -1127,8 +1127,9 @@ class JUnitTestSuite implements TestSuite {
|
|
|
| void computeClassPath() {
|
| classPath = Strings.join(
|
| - ['$buildDir/analyzer/util/analyzer/dart_analyzer.jar',
|
| - '$buildDir/analyzer/dart_analyzer_tests.jar',
|
| + ['$buildDir/compiler/lib/dartc.jar',
|
| + '$buildDir/compiler-tests.jar',
|
| + '$buildDir/closure_out/compiler.jar',
|
| // Third party libraries.
|
| '$dartDir/third_party/args4j/2.0.12/args4j-2.0.12.jar',
|
| '$dartDir/third_party/guava/r09/guava-r09.jar',
|
| @@ -1192,7 +1193,7 @@ class TestUtils {
|
| case 'none':
|
| return 'dart$suffix';
|
| case 'dartc':
|
| - return 'analyzer/bin/dart_analyzer$suffix';
|
| + return 'compiler/bin/dartc$suffix';
|
| case 'dart2js':
|
| var prefix = '';
|
| if (configuration['use_sdk']) {
|
|
|