Add the ability to run tests with several sets of VM flags

tools/testing/architecture.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2011, 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.
 #
 
 """
 Runs a Dart unit test in different configurations: dartium, chromium, ia32, x64,
 arm, simarm, and dartc. Example:
@@ skipping 87 matching lines @@
     if (!needsToWait) pass();
     mainIsFinished = true;
   } catch(var e, var trace) {
     fail(e, trace);
   }
 }
 '''
 
 
 # Patterns for matching test options in .dart files.
-VM_OPTIONS_PATTERN = re.compile(r"// VMOptions=(.*)")
 DART_OPTIONS_PATTERN = re.compile(r"// DartOptions=(.*)")
 
 # Pattern for checking if the test is a web test.
 DOM_IMPORT_PATTERN = re.compile(r"^#import.*(dart:dom|html.dart)'\);",
                                 re.MULTILINE)
 
 # Pattern for matching the output of a browser test.
 BROWSER_OUTPUT_PASS_PATTERN = re.compile(r"^Content-Type: text/plain\nPASS$",
                                          re.MULTILINE)
 
@@ skipping 20 matching lines @@
 
 
 class Architecture(object):
   def __init__(self, root_path, arch, mode, test):
     self.root_path = root_path;
     self.arch = arch;
     self.mode = mode;
     self.test = test;
     self.build_root = utils.GetBuildRoot(OS_GUESS, self.mode, self.arch)
     source = file(test).read()
-    self.vm_options = utils.ParseTestOptions(VM_OPTIONS_PATTERN,
-                                             source,
-                                             root_path)
-    if not self.vm_options: self.vm_options = []
-
-    self.dart_options = utils.ParseTestOptions(DART_OPTIONS_PATTERN,
-                                               source,
-                                               root_path)
+    self.vm_options = []
+    self.dart_options = []
     self.is_web_test = IsWebTest(test, source)
     self.temp_dir = None
 
   def HasFatalTypeErrors(self):
     return False
 
   def GetTestFrameworkPath(self):
     return join(self.root_path, 'tests', 'isolate', 'src',
                'TestFramework.dart')
 
@@ skipping 206 matching lines @@
     else:
       command += ['--', test_path]
 
     return command
 
   def GetFatalTypeErrorsFlags(self):
     return []
 
   def RunTest(self, verbose):
     command = self.GetRunCommand()
-    return ExecuteCommand(command, verbose)
+    return ExeuteCommand(command, verbose)

[Ivan Posva, 2011/10/13 07:17:34]

?

[Søren Gjesse, 2011/10/13 07:28:15]

Accidental edit.

 
   def Cleanup(self):
     return
 
 
 # Long term, we should do the running machinery that is currently in
 # DartRunner.java
 class DartcArchitecture(StandaloneArchitecture):
   def __init__(self, root_path, arch, mode, test):
     super(DartcArchitecture, self).__init__(root_path, arch, mode, test)
@@ skipping 47 matching lines @@
     return ChromiumArchitecture(root_path, arch, mode, test)
 
   elif arch == 'dartium':
     return DartiumArchitecture(root_path, arch, mode, test)
 
   elif arch in ['ia32', 'x64', 'simarm', 'arm']:
     return RuntimeArchitecture(root_path, arch, mode, test)
 
   elif arch == 'dartc':
     return DartcArchitecture(root_path, arch, mode, test)
-