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"); |
} |