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

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

Issue 9513002: test.dart: fix for dartium. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 10 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 | « no previous file | 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 1a6a915249c71bcd8d0ed3d70b60ed41e7f21890..70a8d39f453ac078067600fe3bb7c8aa343e1a6e 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -512,30 +512,33 @@ class StandardTestSuite implements TestSuite {
// Construct the command(s) that compile all the inputs needed by the
// browser test. For dartium, this will be noop commands.
- List<Command> commands = [_compileCommand(
- dartWrapperFilename, compiledDartWrapperFilename,
- component, tempDir.path, vmOptions)];
-
- // some tests require compiling multiple input scripts.
- List<String> otherScripts = optionsFromFile['otherScripts'];
- for (String name in otherScripts) {
- int end = filename.lastIndexOf('/');
- if (end == -1) {
- print('Warning: error processing "OtherScripts" of $filename.');
- print('Skipping test ($testName).');
- return;
- }
- String dir = filename.substring(0, end);
- end = name.lastIndexOf('.dart');
- if (end == -1) {
- print('Warning: error processing "OtherScripts" in $filename.');
- print('Skipping test ($testName).');
- return;
- }
- String compiledName = '${name.substring(0, end)}.js';
+ List<Command> commands = [];
+ if (component != 'dartium') {
commands.add(_compileCommand(
- '$dir/$name', '${tempDir.path}/$compiledName',
+ dartWrapperFilename, compiledDartWrapperFilename,
component, tempDir.path, vmOptions));
+
+ // some tests require compiling multiple input scripts.
+ List<String> otherScripts = optionsFromFile['otherScripts'];
+ for (String name in otherScripts) {
+ int end = filename.lastIndexOf('/');
+ if (end == -1) {
+ print('Warning: error processing "OtherScripts" of $filename.');
+ print('Skipping test ($testName).');
+ return;
+ }
+ String dir = filename.substring(0, end);
+ end = name.lastIndexOf('.dart');
+ if (end == -1) {
+ print('Warning: error processing "OtherScripts" in $filename.');
+ print('Skipping test ($testName).');
+ return;
+ }
+ String compiledName = '${name.substring(0, end)}.js';
+ commands.add(_compileCommand(
+ '$dir/$name', '${tempDir.path}/$compiledName',
+ component, tempDir.path, vmOptions));
+ }
}
// Construct the command that executes the browser test
@@ -599,10 +602,6 @@ class StandardTestSuite implements TestSuite {
args.addAll(vmOptions);
args.add(inputFile);
break;
- case 'dartium':
- // No compilation phase.
- args = null;
- break;
default:
Expect.fail('unimplemented component $component');
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698