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

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

Issue 24168006: Fixing issues from lifecycle events CL (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 3 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 | « tests/html/html.status ('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 3611976c629fda25824fa1f24f4159118aa4344b..85a93c964d8b5c8a6a0d0d523925e968ccdf3434 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -991,15 +991,17 @@ class StandardTestSuite extends TestSuite {
// If necessary, run the Polymer deploy steps.
// TODO(jmesserly): this should be generalized for any tests that
// require Pub deploy, not just polymer.
- if (compiler != 'none' &&
- customHtml.readAsStringSync().contains('polymer/boot.js')) {
-
- commands.add(_polymerDeployCommand(
- customHtmlPath, tempDir, optionsFromFile));
-
- htmlPath = '$tempDir/test/$nameNoExt.html';
- dartWrapperFilename = '${htmlPath}_bootstrap.dart';
- compiledDartWrapperFilename = '$dartWrapperFilename.js';
+ if (customHtml.readAsStringSync().contains('polymer/boot.js')) {
+ if (compiler != 'none') {
+ commands.add(_polymerDeployCommand(
+ customHtmlPath, tempDir, optionsFromFile));
+
+ htmlPath = '$tempDir/test/$nameNoExt.html';
+ dartWrapperFilename = '${htmlPath}_bootstrap.dart';
+ compiledDartWrapperFilename = '$dartWrapperFilename.js';
+ } else {
+ htmlPath = customHtmlPath;
+ }
} else {
htmlPath = '$tempDir/test.html';
dartWrapperFilename = filePath.toNativePath();
« no previous file with comments | « tests/html/html.status ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698