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

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

Issue 24267004: Emit CSP code in separate file. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Make tests pass 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
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 022574d63b393b3bd9ec37fe1c5e3c71ab06d9b5..112bc47491bb3900b14262dd805a3cd460df00a3 100644
--- a/dart/tools/testing/dart/test_suite.dart
+++ b/dart/tools/testing/dart/test_suite.dart
@@ -1026,6 +1026,10 @@ class StandardTestSuite extends TestSuite {
expectedOutput = txtPath;
content = getHtmlLayoutContents(scriptType, new Path("$scriptPath"));
} else {
+ if (compiler == "dart2js" && configuration["csp"]) {
+ scriptPath = scriptPath.replaceFirst('/test.js', '/precompiled.js');
+ }
+
content = getHtmlContents(filename, scriptType,
new Path("$scriptPath"));
}
@@ -1877,9 +1881,6 @@ class TestUtils {
configuration["minified"]) {
args.add("--minify");
}
- if (compiler == "dart2js" && configuration["csp"]) {
- args.add("--disallow-unsafe-eval");
- }
if (compiler == "dartanalyzer" || compiler == "dart2analyzer") {
args.add("--show-package-warnings");
}

Powered by Google App Engine
This is Rietveld 408576698