Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: tools/testing/dart/test_suite.dart

Issue 9702034: Removes dartc reliance on its own libraries, now can be targeted at any implementation's libraries (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: junit tests fixed Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/presubmit.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 4bbd4f41e68941e3fa7c5691e16e3c0937fc745e..cca7e1b87047bdc853b8624e73c94e51596864f3 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -995,12 +995,11 @@ class JUnitTestSuite implements TestSuite {
}
void createTest(successIgnored) {
- String d8 =
- "$buildDir/d8${TestUtils.executableSuffix(configuration['component'])}";
+ var sdkDir = "$buildDir/dart-sdk".trim();
List<String> args = <String>[
'-ea',
'-classpath', classPath,
- '-Dcom.google.dart.runner.d8=$d8',
+ '-Dcom.google.dart.sdk=$sdkDir',
'-Dcom.google.dart.corelib.SharedTests.test_py=' +
dartDir + '/tools/test.py',
'org.junit.runner.JUnitCore'];
@@ -1019,18 +1018,14 @@ 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/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-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 +1084,7 @@ class TestUtils {
case 'vm':
return 'dart$suffix';
case 'dartc':
- return 'compiler/bin/dartc$suffix';
+ return 'analysis/darta$suffix';
case 'frog':
case 'dart2js':
return 'frog/bin/frog$suffix';
@@ -1104,7 +1099,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':
« no previous file with comments | « tools/presubmit.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698