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

test/mjsunit/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 13 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import test
 import os
 from os.path import join, dirname, exists
 import re
 import tempfile
 
-MJSUNIT_DEBUG_FLAGS = ['--enable-slow-asserts', '--debug-code', '--verify-heap']
 FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
 SELF_SCRIPT_PATTERN = re.compile(r"//\s+Env: TEST_FILE_NAME")
 
 
 class MjsunitTestCase(test.TestCase):
 
   def __init__(self, path, file, mode, context, config):
-    super(MjsunitTestCase, self).__init__(context, path)
+    super(MjsunitTestCase, self).__init__(context, path, mode)
     self.file = file
     self.config = config
-    self.mode = mode
     self.self_script = 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()
-    if self.mode == 'debug':
-      result += MJSUNIT_DEBUG_FLAGS
     additional_files = []
     files_match = FILES_PATTERN.search(source);
     # Accept several lines of 'Files:'
     while True:
       if files_match:
         additional_files += files_match.group(1).strip().split()
         files_match = FILES_PATTERN.search(source, files_match.end())
       else:
         break
     for a_file in additional_files:
@@ skipping 14 matching lines @@
              {'name': name, \
               'value': value.replace('\\', '\\\\').replace('\'', '\\\'') }
     try:
       os.write(fd_self_script, MakeJsConst('TEST_FILE_NAME', self.file))
     except IOError, e:
       test.PrintError("write() " + str(e))
     os.close(fd_self_script)
     self.self_script = self_script
     return self_script
 
-  def Cleanup(self):
-    if self.self_script:
+  def AfterRun(self, result):
+    if self.self_script and (not result.HasPreciousOutput()):
       test.CheckedUnlink(self.self_script)
 
 class MjsunitTestConfiguration(test.TestConfiguration):
 
   def __init__(self, context, root):
     super(MjsunitTestConfiguration, self).__init__(context, root)
 
   def Ls(self, path):
     def SelectTest(name):
       return name.endswith('.js') and name != 'mjsunit.js'
@@ skipping 19 matching lines @@
 
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'mjsunit.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 
 def GetConfiguration(context, root):
   return MjsunitTestConfiguration(context, root)