| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index df2d2716d86623b3ccc5b3a2bddb9ae0b56268ee..d388fdf0a8ce20951d9d8bfa71eafb0e1896814f 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -1096,7 +1096,6 @@ class StandardTestSuite extends TestSuite {
|
| if (packageRoot != null) {
|
| args.add(packageRoot);
|
| }
|
| - if (compiler == 'dart2dart') args.add('--out=$outputFile');
|
| args.add('--out=$outputFile');
|
| args.add(inputFile);
|
| break;
|
| @@ -1145,8 +1144,9 @@ class StandardTestSuite extends TestSuite {
|
| // '$compile-$runtime' directory name.
|
| var checked = configuration['checked'] ? '-checked' : '';
|
| var minified = configuration['minified'] ? '-minified' : '';
|
| + var csp = configuration['csp'] ? '-csp' : '';
|
| var dirName = "${configuration['compiler']}-${configuration['runtime']}"
|
| - "$checked$minified";
|
| + "$checked$minified$csp";
|
| Path generatedTestPath = new Path(buildDir)
|
| .append('generated_tests')
|
| .append(dirName)
|
| @@ -1814,6 +1814,9 @@ class TestUtils {
|
| configuration["minified"]) {
|
| args.add("--minify");
|
| }
|
| + if (compiler == "dart2js" && configuration["csp"]) {
|
| + args.add("--disallow-unsafe-eval");
|
| + }
|
| return args;
|
| }
|
|
|
|
|