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

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

Issue 10266011: Shoehorn dart2js into the SDK. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 8 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
Index: dart/tools/testing/dart/test_suite.dart
diff --git a/dart/tools/testing/dart/test_suite.dart b/dart/tools/testing/dart/test_suite.dart
index 0b0ac483f115b7131398805fa24768f9b275a7bf..1c213725856bc7ed31af326576c323c6327b7eed 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -1233,10 +1233,14 @@ class TestUtils {
case 'dartc':
return 'compiler/bin/dartc$suffix';
case 'dart2js':
+ var prefix = '';
+ if (configuration['use_sdk']) {
+ prefix = 'dart-sdk/bin/';
Bill Hesse 2012/04/30 15:21:32 Shouldn't the --use_sdk option apply to frog and t
ahe 2012/05/02 10:32:17 Frog is EOL and the frog/bin vs dart-sdk/bin is a
+ }
if (configuration['host_checked']) {
- return 'dart2js_developer$suffix';
+ return '${prefix}dart2js_developer$suffix';
} else {
- return 'dart2js$suffix';
+ return '${prefix}dart2js$suffix';
}
case 'frog':
return 'frog/bin/frog$suffix';
@@ -1251,11 +1255,7 @@ class TestUtils {
case 'dartc':
return 'compiler/bin/dartc$suffix';
case 'dart2js':
- if (configuration['host_checked']) {
- return 'dart2js_developer$suffix';
- } else {
- return 'dart2js$suffix';
- }
+ return executableName(configuration);
case 'frog':
return 'frog/bin/frog$suffix';
default:
« dart/tools/testing/dart/test_options.dart ('K') | « dart/tools/testing/dart/test_options.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698