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

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

Issue 1305183010: - Reorder the priority of flags in the test harness when passed to the VM: (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 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
« no previous file with comments | « tests/standalone/no_assert_test.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « tests/standalone/no_assert_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698