Fix running of tests on Chromium and Dartium

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.
 
 """Common Testconfiguration subclasses used to define a class of tests."""
 
 import atexit
 import fileinput
 import os
 import re
@@ skipping 38 matching lines @@
         if temp_dir:
           dirs.append(temp_dir)
     if not dirs:
       return
     if not utils.Daemonize():
       return
     os.execlp('rm', *(['rm', '-rf'] + dirs))
 
   def CreateTestCases(self, test_path, path, filename, mode, arch):
     """Given a .dart filename, create a StandardTestCase from it."""
+    # 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_list = utils.ParseTestOptionsMultiple(VM_OPTIONS_PATTERN,
+                                                     source,
+                                                     test_path)
     tags = {}
     if filename.endswith('.dart'):
       tags = self.SplitMultiTest(test_path, filename)
     if arch in ['dartium', 'chromium']:
       if tags:
         return []
       else:
-        return [test_case.BrowserTestCase(
-            self.context, test_path, filename, False, mode, arch)]
+        if vm_options_list:
+          tests = []
+          for options in vm_options_list:
+            tests.append(test_case.BrowserTestCase(
+                self.context, test_path, filename, False, mode, arch, options))
+          return tests
+        else:
+          return [test_case.BrowserTestCase(
+              self.context, test_path, filename, False, mode, arch)]
     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:
-        # 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_list = utils.ParseTestOptionsMultiple(VM_OPTIONS_PATTERN,
-                                                         source,
-                                                         test_path)
         if vm_options_list:
           for options in vm_options_list:
             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))
       return tests
 
   def ListTests(self, current_path, path, mode, arch):
@@ skipping 191 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