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

test/es5conform/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 19 matching lines @@
 import os
 from os.path import join, exists
 
 
 HARNESS_FILES = ['sth.js']
 
 
 class ES5ConformTestCase(test.TestCase):
 
   def __init__(self, filename, path, context, root, mode, framework):
-    super(ES5ConformTestCase, self).__init__(context, path)
+    super(ES5ConformTestCase, self).__init__(context, path, mode)
     self.filename = filename
-    self.mode = mode
     self.framework = framework
     self.root = root
 
   def IsNegative(self):
     return self.filename.endswith('-n.js')
 
   def GetLabel(self):
     return "%s es5conform %s" % (self.mode, self.GetName())
 
   def IsFailureOutput(self, output):
     if output.exit_code != 0:
       return True
     return 'FAILED!' in output.stdout
 
   def GetCommand(self):
-    result = [self.context.GetVm(self.mode)]
+    result = self.context.GetVmCommand(self, self.mode)
     result += ['-e', 'var window = this']
     result += self.framework
     result.append(self.filename)
     result += ['-e', 'ES5Harness.startTesting()']
     return result
 
   def GetName(self):
     return self.path[-1]
 
   def GetSource(self):
@@ skipping 30 matching lines @@
     return ['sample', 'sample=shell']
 
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'es5conform.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 def GetConfiguration(context, root):
   return ES5ConformTestConfiguration(context, root)