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

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

Issue 10854232: Continue removal of frog. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 4 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
« tools/create_sdk.py ('K') | « tools/testing/dart/test_options.dart ('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
===================================================================
--- tools/testing/dart/test_suite.dart (revision 10970)
+++ tools/testing/dart/test_suite.dart (working copy)
@@ -699,17 +699,6 @@
String executable = TestUtils.compilerPath(configuration);
List<String> args = TestUtils.standardOptions(configuration);
switch (compiler) {
- case 'frog':
- String libdir = configuration['froglib'];
- if (libdir == '') {
- libdir = dartDir.append('frog/lib').toNativePath();
- }
- args.addAll(['--libdir=$libdir',
- '--compile-only',
- '--out=$outputFile']);
- args.addAll(vmOptions);
- args.add(inputFile);
- break;
case 'dart2js':
case 'dart2dart':
if (compiler == 'dart2dart') args.add('--out=$outputFile');
@@ -765,7 +754,6 @@
case 'none':
case 'dart2dart':
return 'application/dart';
- case 'frog':
case 'dart2js':
case 'dartc':
return 'text/javascript';
@@ -846,10 +834,6 @@
args.add('--error_format');
args.add('machine');
}
- if ((configuration['compiler'] == 'frog')
- && (configuration['runtime'] == 'none')) {
- args.add('--compile-only');
- }
bool isMultitest = optionsFromFile["isMultitest"];
List<String> dartOptions = optionsFromFile["dartOptions"];
@@ -1268,8 +1252,6 @@
} else {
return '${prefix}dart2js$suffix';
}
- case 'frog':
- return 'frog/bin/frog$suffix';
default:
throw "Unknown executable for: ${configuration['compiler']}";
}
@@ -1282,8 +1264,6 @@
case 'dart2js':
case 'dart2dart':
return executableName(configuration);
- case 'frog':
- return 'frog/bin/frog$suffix';
default:
throw "Unknown compiler for: ${configuration['compiler']}";
}
@@ -1322,10 +1302,7 @@
if (configuration['compiler'] == 'none') {
return null; // No separate compiler for dartium tests.
}
- var name = configuration['frog'];
- if (name == '') {
- name = '${buildDir(configuration)}/${compilerName(configuration)}';
- }
+ var name = '${buildDir(configuration)}/${compilerName(configuration)}';
if (!(new File(name)).existsSync() && !configuration['list']) {
throw "Executable '$name' does not exist";
}
« tools/create_sdk.py ('K') | « tools/testing/dart/test_options.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698