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

tools/testing/test_configuration.py

 # 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.
 
 import atexit
 import fileinput
 import os
 import test
 import platform
 import re
 import shutil
 import sys
 import tempfile
 
 from testing import test_case
 import test
 import utils
 
 from os.path import join, exists, basename
 
 import utils
 
+# Patterns for matching test options in .dart files.
+VM_OPTIONS_PATTERN = re.compile(r"// VMOptions=(.*)")
+
 class Error(Exception):
   pass
 
 class TestConfigurationError(Error):
   pass
 
 class StandardTestConfiguration(test.TestConfiguration):
   LEGAL_KINDS = set(['compile-time error',
                      'runtime error',
                      'static type error',
@@ skipping 30 matching lines @@
     else:
       tests = []
       if tags:
         for tag in sorted(tags):
           kind, test_source = tags[tag]
           if not self.Contains(path, test_path + [tag]):
             continue
           tests.append(test_case.MultiTestCase(self.context,
               test_path + [tag], test_source, kind, mode, arch))
       else:
-        tests.append(test_case.StandardTestCase(self.context,
-            test_path, filename, mode, arch))
+        if arch in ['ia32', 'x64', 'simarm', 'arm']:

[ngeoffray, 2011/10/13 07:53:24]

I don't think we want to filter on the arch. The feature is also useful for the
other archs (yes, VMOptions is misleading).

[Søren Gjesse, 2011/10/13 08:57:07]

Done.

+          # Look for VM specified as comments in the source file. If
+          # several sets of VM options are specified create a separate
+          # test for each set.
+          source = file(filename).read()
+          vm_options = utils.ParseTestOptionsMultiple(VM_OPTIONS_PATTERN,

[ngeoffray, 2011/10/13 07:53:24]

vm_options_list = ?

[Søren Gjesse, 2011/10/13 08:57:07]

Done.

+                                                      source,
+                                                      test_path)
+          if vm_options:
+            for options in vm_options:
+              tests.append(test_case.StandardTestCase(self.context,
+                  test_path, filename, mode, arch, options))
+          else:
+            tests.append(test_case.StandardTestCase(self.context,
+                test_path, filename, mode, arch))
+        else:
+          tests.append(test_case.StandardTestCase(self.context,
+              test_path, filename, mode, arch))
       return tests
 
   def ListTests(self, current_path, path, mode, arch):
     tests = []
     for root, dirs, files in os.walk(join(self.root, 'src')):
       for f in [x for x in files if self.IsTest(x)]:
         if f.endswith(".dart"):
           test_path = current_path + [ f[:-5] ]  # Remove .dart suffix.
         elif f.endswith(".app"):
           test_path = current_path + [ f[:-4] ]  # Remove .app suffix.
@@ skipping 77 matching lines @@
     return tests
 
 class BrowserTestCase(test_case.StandardTestCase):
   def __init__(self, context, path, filename,
                fatal_static_type_errors, mode, arch):
     super(test_case.BrowserTestCase, self).__init__(context, path, filename, mode, arch)
     self.fatal_static_type_errors = fatal_static_type_errors
 
   def IsBatchable(self):
     return True
-      
+
   def Run(self):
     command = self.run_arch.GetCompileCommand(self.fatal_static_type_errors)
     if command != None:
       # We change the directory where dartc will be launched because
       # it is not predictable on the location of the compiled file. In
       # case the test is a web test, we make sure the app file is not
       # in a subdirectory.
       cwd = None
       if self.run_arch.is_web_test: cwd = self.run_arch.temp_dir
       command = command[:1] + self.context.flags + command[1:]
@@ skipping 59 matching lines @@
       for root, dirs, files in os.walk(os.path.join(client_path, src_dir)):
         ignore_dirs = [d for d in dirs if d.startswith('.')]
         for d in ignore_dirs:
           dirs.remove(d)
         for f in files:
           filename = [os.path.basename(client_path)]
           filename.extend(root[len(client_path) + 1:].split(os.path.sep))
           filename.append(f) # Remove .lib or .app suffix.
           test_path = current_path + filename
           test_dart_file = os.path.join(root, f)
-          if ((not self.Contains(path, test_path)) 
+          if ((not self.Contains(path, test_path))
               or (not self.IsTest(test_dart_file))):
             continue
           tests.append(test_case.CompilationTestCase(test_path,
                                            self.context,
                                            test_dart_file,
                                            mode,
                                            arch))
     atexit.register(lambda: self._cleanup(tests))
     return tests
 
@@ skipping 17 matching lines @@
 
   def GetTestStatus(self, sections, defs):
     status = os.path.join(self.root, 'dartc.status')
     if os.path.exists(status):
       test.ReadConfigurationInto(status, sections, defs)
 
   def _cleanup(self, tests):
     if not utils.Daemonize(): return
     os.execlp('rm', *(['rm', '-rf'] + [t.temp_dir for t in tests]))
     raise