Index: tools/testing/dart/test_suite.dart |
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
index c3ea82f31e2e8b6ce7df48fdafa8e4e4a543e452..a3531a28c50816a5f04856f92fd7c91742b0b929 100644 |
--- a/tools/testing/dart/test_suite.dart |
+++ b/tools/testing/dart/test_suite.dart |
@@ -1019,19 +1019,12 @@ class JUnitTestSuite implements TestSuite { |
void computeClassPath() { |
classPath = Strings.join( |
- ['$buildDir/compiler/lib/dartc.jar', |
- '$buildDir/compiler/lib/corelib.jar', |
- '$buildDir/compiler-tests.jar', |
- '$buildDir/closure_out/compiler.jar', |
+ ['$buildDir/lib/analysis/darta.jar', |
+ '$buildDir/analysis/darta-tests.jar', |
// Third party libraries. |
'$dartDir/third_party/args4j/2.0.12/args4j-2.0.12.jar', |
'$dartDir/third_party/guava/r09/guava-r09.jar', |
'$dartDir/third_party/json/r2_20080312/json.jar', |
- '$dartDir/third_party/rhino/1_7R3/js.jar', |
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar', |
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar', |
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar', |
- '$dartDir/third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar', |
'$dartDir/third_party/junit/v4_8_2/junit.jar'], |
':'); // Path separator. |
} |
@@ -1089,7 +1082,7 @@ class TestUtils { |
case 'vm': |
return 'dart$suffix'; |
case 'dartc': |
- return 'compiler/bin/dartc$suffix'; |
+ return 'analysis/darta$suffix'; |
case 'frog': |
case 'leg': |
return 'frog/bin/frog$suffix'; |
@@ -1104,7 +1097,7 @@ class TestUtils { |
String suffix = executableSuffix(configuration['component']); |
switch (configuration['component']) { |
case 'dartc': |
- return 'compiler/bin/dartc$suffix'; |
+ return 'analysis/darta$suffix'; |
case 'frogium': |
case 'legium': |
case 'webdriver': |