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

test/sputnik/testcfg.py

 # Copyright 2009 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 18 matching lines @@
 import os
 from os.path import join, exists
 import sys
 import test
 import time
 
 
 class SputnikTestCase(test.TestCase):
 
   def __init__(self, case, path, context, mode):
-    super(SputnikTestCase, self).__init__(context, path)
+    super(SputnikTestCase, self).__init__(context, path, mode)
     self.case = case
-    self.mode = mode
     self.tmpfile = None
     self.source = None
 
   def IsNegative(self):
     return '@negative' in self.GetSource()
 
   def IsFailureOutput(self, output):
     if output.exit_code != 0:
       return True
     out = output.stdout
     return "SputnikError" in out
 
   def BeforeRun(self):
     self.tmpfile = sputnik.TempFile(suffix='.js', prefix='sputnik-', text=True)
     self.tmpfile.Write(self.GetSource())
     self.tmpfile.Close()
 
-  def AfterRun(self):
-    self.tmpfile.Dispose()
+  def AfterRun(self, result):
+    # Dispose the temporary file if everything looks okay.
+    if not result.HasPreciousOutput(): self.tmpfile.Dispose()
     self.tmpfile = None
 
   def GetCommand(self):
-    result = [self.context.GetVm(self.mode)]
+    result = self.context.GetVmCommand(self, self.mode)
     result.append(self.tmpfile.name)
     return result
 
   def GetLabel(self):
     return "%s sputnik %s" % (self.mode, self.GetName())
 
   def GetName(self):
     return self.path[-1]
 
   def GetSource(self):
@@ skipping 28 matching lines @@
     return ['sample', 'sample=shell']
 
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'sputnik.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 def GetConfiguration(context, root):
   return SputnikTestConfiguration(context, root)