Chromium Code Reviews| Index: tools/testing/dart/test_suite.dart |
| =================================================================== |
| --- tools/testing/dart/test_suite.dart (revision 25273) |
| +++ tools/testing/dart/test_suite.dart (working copy) |
| @@ -1467,7 +1467,13 @@ |
| var needsVmOptions = COMPILERS.contains(configuration['compiler']) && |
| RUNTIMES.contains(configuration['runtime']); |
| if (!needsVmOptions) return [[]]; |
| - final vmOptions = optionsFromFile['vmOptions']; |
| + var vmOptions = new List.from(optionsFromFile['vmOptions']); |
| + // Add general vm options that is given to the testing script. |
|
kustermann
2013/07/23 13:55:18
"that is given" -> "that were given"
ricow1
2013/07/24 11:32:50
Done.
|
| + if (configuration['vm-options'] != null) { |
| + for (var list in vmOptions) { |
| + list.addAll(configuration['vm-options'].split(" ")); |
|
kustermann
2013/07/23 13:55:18
Make sure we don't add empty options (i.e. conside
ricow1
2013/07/24 11:32:50
Done.
|
| + } |
| + } |
|
kustermann
2013/07/23 13:55:18
This change is not going to work. I think this fun
ricow1
2013/07/24 11:32:50
Done.
|
| if (configuration['compiler'] != 'dart2dart') return vmOptions; |
| // Temporary workaround for race in test suite: tests with different |
| // vm options are still compiled into the same output file which |