Fix handling of VMOptions= in multi tests

tools/testing/test_configuration.py

Index: tools/testing/test_configuration.py
diff --git a/tools/testing/test_configuration.py b/tools/testing/test_configuration.py
index 8177d191a0c32392f2cfec1ff673cd9c30060e52..806549e1be3637aacbe0a2f3dedca9e2609d2e74 100644
--- a/tools/testing/test_configuration.py
+++ b/tools/testing/test_configuration.py
@@ -88,12 +88,21 @@ class StandardTestConfiguration(test.TestConfiguration):
           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: