Chromium Code Reviews| Index: tools/testing/dart/test_suite.dart |
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
| index aef5b3f2a06421b5484ed83c6e2ef5c1354ddfd2..9519101856039fcba9b24ddb1e1b27da28774c69 100644 |
| --- a/tools/testing/dart/test_suite.dart |
| +++ b/tools/testing/dart/test_suite.dart |
| @@ -968,15 +968,20 @@ class StandardTestSuite extends TestSuite { |
| List<List<String>> vmOptionsList = getVmOptions(info.optionsFromFile); |
| assert(!vmOptionsList.isEmpty); |
| + List stdOptions = TestUtils.standardOptions(configuration); |
| for (var vmOptions in vmOptionsList) { |
| - var allVmOptions = vmOptions; |
| - if (!extraVmOptions.isEmpty) { |
| - allVmOptions = new List.from(vmOptions)..addAll(extraVmOptions); |
| - } |
| - |
| - var commands = []..addAll(baseCommands); |
| - commands.addAll(makeCommands(info, allVmOptions, commonArguments)); |
| + var allVmOptions = new List() |
| + // Get the standard options for this run of the testsuite. |
| + ..addAll(stdOptions) |
| + // Add the current VMOptions line from the file. |
| + ..addAll(vmOptions) |
| + // Finally add the extra VM options. |
| + ..addAll(extraVmOptions); |
| + |
| + var commands = new List() |
| + ..addAll(baseCommands) |
| + ..addAll(makeCommands(info, allVmOptions, commonArguments)); |
| enqueueNewTestCase( |
| new TestCase('$suiteName/$testName', |
| commands, |
| @@ -1535,7 +1540,7 @@ class StandardTestSuite extends TestSuite { |
| } |
| List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) { |
| - List args = TestUtils.standardOptions(configuration); |
| + List args = []; |
|
ricow1
2015/09/04 06:14:42
this will not work, you now eat all of the compile
|
| String packageRoot = packageRootArgument(optionsFromFile['packageRoot']); |
| if (packageRoot != null) { |