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

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

Issue 136333005: Run out.precompiled.js for commandline JS runtimes instead of out.js (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 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: 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 6d2bbc12c2907a9737598cd99510db5e935cb89b..2a2e80973c17f4e7c7e3b964b5287f530b96c9e5 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -1010,16 +1010,21 @@ class StandardTestSuite extends TestSuite {
dart2JsBootstrapDependencies, compilerPath, args,
environmentOverrides);
+ var javascriptFile = '$tempDir/out.js';
+ if (configuration['csp']) {
+ javascriptFile = '$tempDir/out.precompiled.js';
+ }
+
List<Command> commands = <Command>[command];
if (info.hasCompileError) {
// Do not attempt to run the compiled result. A compilation
// error should be reported by the compilation command.
} else if (configuration['runtime'] == 'd8') {
commands.add(CommandBuilder.instance.getJSCommandlineCommand(
- "d8", d8FileName, ['$tempDir/out.js'], environmentOverrides));
+ "d8", d8FileName, [javascriptFile], environmentOverrides));
} else if (configuration['runtime'] == 'jsshell') {
commands.add(CommandBuilder.instance.getJSCommandlineCommand(
- "jsshell", jsShellFileName, ['$tempDir/out.js'],
+ "jsshell", jsShellFileName, [javascriptFile],
environmentOverrides));
}
return commands;
« 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