Add support for passing in vm options to the testing script.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 410 matching lines @@
  */
 class StandardTestSuite extends TestSuite {
   final Path suiteDir;
   final List<String> statusFilePaths;
   TestCaseEvent doTest;
   TestExpectations testExpectations;
   List<TestInformation> cachedTests;
   final Path dartDir;
   Predicate<String> isTestFilePredicate;
   final bool listRecursively;
+  final extraVmOptions;
 
   static final RegExp multiTestRegExp = new RegExp(r"/// [0-9][0-9]:(.*)");
 
+
   StandardTestSuite(Map configuration,
                     String suiteName,
                     Path suiteDirectory,
                     this.statusFilePaths,
                     {this.isTestFilePredicate,
                     bool recursive: false})
   : super(configuration, suiteName),
     dartDir = TestUtils.dartDir(),
     listRecursively = recursive,
-    suiteDir = TestUtils.dartDir().join(suiteDirectory);
+    suiteDir = TestUtils.dartDir().join(suiteDirectory),
+    extraVmOptions = TestUtils.getExtraVmOptions(configuration);
 
   /**
    * Creates a test suite whose file organization matches an expected structure.
    * To use this, your suite should look like:
    *
    *     dart/
    *       path/
    *         to/
    *           mytestsuite/
    *             mytestsuite.status
@@ skipping 275 matching lines @@
       }
     }
 
     var commonArguments = commonArgumentsFromFile(info.filePath,
                                                   info.optionsFromFile);
 
     List<List<String>> vmOptionsList = getVmOptions(info.optionsFromFile);
     assert(!vmOptionsList.isEmpty);
 
     for (var vmOptions in vmOptionsList) {
+      var allVmOptions = vmOptions;
+      if (!extraVmOptions.isEmpty) {
+        allVmOptions = new List.from(vmOptions)..addAll(extraVmOptions);
+      }
+
       doTest(new TestCase('$suiteName/$testName',
-                          makeCommands(info, vmOptions, commonArguments),
+                          makeCommands(info, allVmOptions, commonArguments),
                           configuration,
                           completeHandler,
                           expectations,
                           isNegative: isNegative,
                           info: info));
     }
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     var compiler = configuration['compiler'];
@@ skipping 487 matching lines @@
     if (packageRoot != null) {
       args.add(packageRoot);
     }
     args.addAll(additionalOptions(filePath));
     if (configuration['analyzer']) {
       args.add('--machine');
     }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
-    List<List<String>> vmOptionsList = getVmOptions(optionsFromFile);
+
     assert(!isMultitest || dartOptions == null);
     if (dartOptions == null) {
       args.add(filePath.toNativePath());
     } else {
       var executable_name = dartOptions[0];
       // TODO(ager): Get rid of this hack when the runtime checkout goes away.
       var file = new File(executable_name);
       if (!file.existsSync()) {
         executable_name = '../$executable_name';
         assert(new File(executable_name).existsSync());
@@ skipping 202 matching lines @@
              "numCompileTimeAnnotations": numCompileTimeAnnotations };
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {
     var COMPILERS = const ['none', 'dart2dart'];
     var RUNTIMES = const ['none', 'vm', 'drt', 'dartium'];
     var needsVmOptions = COMPILERS.contains(configuration['compiler']) &&
                          RUNTIMES.contains(configuration['runtime']);
     if (!needsVmOptions) return [[]];
     final vmOptions = optionsFromFile['vmOptions'];
+
     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
     // may lead to reads from empty files.
     return [vmOptions[0]];
   }
 
   /**
    * Read options from a co19 test file.
    *
@@ skipping 425 matching lines @@
    * bootstrapping test.dart.
    */
   static Path get dartTestExecutable {
     var path = '${TestUtils.dartDir()}/tools/testing/bin/'
         '${Platform.operatingSystem}/dart';
     if (Platform.operatingSystem == 'windows') {
       path = '$path.exe';
     }
     return new Path(path);
   }
+
+  /** 
+   * Gets extra vm options passed to the testing script.
+   */
+  static List<String> getExtraVmOptions(Map configuration) {
+    var extraVmOptions = [];
+    if (configuration['vm-options'] != null) {
+      extraVmOptions = configuration['vm-options'].split(" ");
+      extraVmOptions.removeWhere((s) => s.trim() == "");
+    }
+    return extraVmOptions;
+  }
+
+
 }
 
 class SummaryReport {
   static int total = 0;
   static int skipped = 0;
   static int noCrash = 0;
   static int pass = 0;
   static int failOk = 0;
   static int fail = 0;
   static int crash = 0;
@@ skipping 40 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }