Remove support for logging into a memory buffer.

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 15 matching lines @@
 # 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
 
 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")
+ENV_VARS_PATTERN = re.compile(r"//\s+Env:(.*)")
+SELF_SCRIPT_PATTERN = re.compile("TEST_FILE_NAME")
+LOG_FILE_PATTERN = re.compile("LOG_FILE_NAME")
 
 
 class MjsunitTestCase(test.TestCase):
 
   def __init__(self, path, file, mode, context, config, isolates):
     super(MjsunitTestCase, self).__init__(context, path, mode)
     self.file = file
     self.config = config
     self.self_script = False
+    self.log_file = False
     self.isolates = isolates
 
   def GetLabel(self):
     return "%s %s" % (self.mode, self.GetName())
 
   def GetName(self):
     return self.path[-1] + ["", "-isolates"][self.isolates]
 
   def TestsIsolates(self):
     return self.isolates
 
   def GetVmCommand(self, source):
     result = self.config.context.GetVmCommand(self, self.mode)
     flags_match = FLAGS_PATTERN.search(source)
     if flags_match:
       result += flags_match.group(1).strip().split()
     return result
 
+  def GetEnvArguments(self, source):
+    result = []
+    env_vars_match = ENV_VARS_PATTERN.search(source)
+    if env_vars_match:
+      env_vars = env_vars_match.group(1)
+      provide_test_file_name = SELF_SCRIPT_PATTERN.search(env_vars)
+      provide_log_file_name = LOG_FILE_PATTERN.search(env_vars)
+    else:
+      return result
+    if provide_test_file_name or provide_log_file_name:
+      self_script_file = self.CreateSelfScript(
+        provide_test_file_name, provide_log_file_name)
+      if self.log_file:
+        result.append("--logfile=" + self.log_file)
+      result.append(self_script_file)
+    return result
+
   def GetVmArguments(self, source):
     result = []
     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:
       result.append(join(dirname(self.config.root), '..', a_file))
     framework = join(dirname(self.config.root), 'mjsunit', 'mjsunit.js')
-    if SELF_SCRIPT_PATTERN.search(source):
-      result.append(self.CreateSelfScript())
     result += [framework, self.file]
     return result
 
   def GetCommand(self):
     source = open(self.file).read()
     result = self.GetVmCommand(source)
+    result += self.GetEnvArguments(source)
     result += self.GetVmArguments(source)
     if self.isolates:
       result.append("--isolate")
       result += self.GetVmArguments(source)
     return result
 
   def GetSource(self):
     return open(self.file).read()
 
-  def CreateSelfScript(self):
+  def CreateSelfScript(self, provide_test_file_name, provide_log_file_name):
     (fd_self_script, self_script) = tempfile.mkstemp(suffix=".js")
+    if provide_log_file_name:
+      (fd_log_file, log_file) = tempfile.mkstemp(suffix=".log")
+      os.close(fd_log_file)
+      self.log_file = log_file
     def MakeJsConst(name, value):
       return "var %(name)s=\'%(value)s\';\n" % \
              {'name': name, \
               'value': value.replace('\\', '\\\\').replace('\'', '\\\'') }
     try:
-      os.write(fd_self_script, MakeJsConst('TEST_FILE_NAME', self.file))
+      if provide_test_file_name:
+        os.write(fd_self_script, MakeJsConst('TEST_FILE_NAME', self.file))
+      if provide_log_file_name:
+        os.write(fd_self_script, MakeJsConst('LOG_FILE_NAME', log_file))
     except IOError, e:
       test.PrintError("write() " + str(e))
     os.close(fd_self_script)
     self.self_script = self_script
     return self_script
 
   def AfterRun(self, result):
-    if self.self_script and (not result or (not result.HasPreciousOutput())):
-      test.CheckedUnlink(self.self_script)
+    if not result or (not result.HasPreciousOutput()):
+      if self.self_script:
+        test.CheckedUnlink(self.self_script)
+      if self.log_file:
+        test.CheckedUnlink(self.log_file)
 
 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'
     return [f[:-3] for f in os.listdir(path) if SelectTest(f)]
@@ skipping 27 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)