Refactor the tools/test.py script and related testcfg.py files....

test/message/testcfg.py

 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 17 matching lines @@
 import test
 import os
 from os.path import join, dirname, exists, basename, isdir
 import re
 
 FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
 
 class MessageTestCase(test.TestCase):
 
   def __init__(self, path, file, expected, mode, context, config):
-    super(MessageTestCase, self).__init__(context, path)
+    super(MessageTestCase, self).__init__(context, path, mode)
     self.file = file
     self.expected = expected
     self.config = config
-    self.mode = mode
 
   def IgnoreLine(self, str):
     """Ignore empty lines and valgrind output."""
     if not str: return True
     else: return str.startswith('==') or str.startswith('**')
 
   def IsFailureOutput(self, output):
     f = file(self.expected)
     # Skip initial '#' comment and spaces
     for line in f:
@@ skipping 19 matching lines @@
         return True
     return False
 
   def GetLabel(self):
     return "%s %s" % (self.mode, self.GetName())
 
   def GetName(self):
     return self.path[-1]
 
   def GetCommand(self):
-    result = [self.config.context.GetVm(self.mode)]
+    result = self.config.context.GetVmCommand(self, self.mode)
     source = open(self.file).read()
     flags_match = FLAGS_PATTERN.search(source)
     if flags_match:
       result += flags_match.group(1).strip().split()
     result.append(self.file)
     return result
 
   def GetSource(self):
     return (open(self.file).read()
           + "\n--- expected output ---\n"
@@ skipping 33 matching lines @@
     return ['sample', 'sample=shell']
 
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'message.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 def GetConfiguration(context, root):
   return MessageTestConfiguration(context, root)