Fix handling of VMOptions= in multi tests

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 70 matching lines @@
           return [test_case.BrowserTestCase(
               self.context, test_path, filename, False, mode, arch, component,
               self.flags)]
     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, component,
-                                               self.flags))
+          if vm_options_list:
+            for options in vm_options_list:
+              tests.append(test_case.MultiTestCase(self.context,
+                                                   test_path + [tag],
+                                                   test_source,
+                                                   kind,
+                                                   mode, arch, component,
+                                                   options + self.flags))
+          else:
+            tests.append(test_case.MultiTestCase(self.context,
+                                                 test_path + [tag],
+                                                 test_source,
+                                                 kind,
+                                                 mode, arch, component,
+                                                 self.flags))
       else:
         if vm_options_list:
           for options in vm_options_list:
             tests.append(test_case.StandardTestCase(self.context,
                 test_path, filename, mode, arch, component,
                 options + self.flags))
         else:
           tests.append(test_case.StandardTestCase(self.context,
               test_path, filename, mode, arch, component, self.flags))
       return tests
@@ skipping 199 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