[pypy-svn] r60188 - pypy/build/benchmem

[xoraxax at codespeak.net]

Author: xoraxax
Date: Thu Nov 27 17:57:29 2008
New Revision: 60188

Modified:
   pypy/build/benchmem/report.py
   pypy/build/benchmem/runbench.py
Log:
Also benchmark optparse, fix nameerror, shorten executable names.

Modified: pypy/build/benchmem/report.py
==============================================================================
--- pypy/build/benchmem/report.py	(original)
+++ pypy/build/benchmem/report.py	Thu Nov 27 17:57:29 2008
@@ -335,14 +335,11 @@
 class BaseTimeOfInterpreters(ReporterBase):
     benchtype = "basetime" 
 
-    def getexecutables(self):
-        return [r.executable for r in self.resultset.results]
-
     def run_text(self):
         tw = py.io.TerminalWriter()
         tw.sep("=", "Basetime of interpreters")
         # result.mintimings -> [(name, timings_dict)]
-        executables = self.getexecutables()
+        executables = self.getexecutables(short=True)
         row0 = "run real user sys".split()
         rows = [row0]
         names = [x[0] for x in self.resultset.results[0].mintimings]
@@ -357,7 +354,7 @@
 
     def run_rest(self, filename="table-basetime.txt"):
         p = py.path.local(filename)
-        executables = self.getexecutables()
+        executables = self.getexecutables(short=True)
         row0 = ["startup"] + executables
         rows = [row0]
         # result.mintimings -> [(name, timings_dict)]

Modified: pypy/build/benchmem/runbench.py
==============================================================================
--- pypy/build/benchmem/runbench.py	(original)
+++ pypy/build/benchmem/runbench.py	Thu Nov 27 17:57:29 2008
@@ -121,10 +121,11 @@
                     stderr=PIPE, close_fds=True, env=env)
             if popen.wait():
                 print "ERROR in command", cmds
+                output_error = popen.stderr.read()
                 print "stderr:", output_error
                 continue
-            output_error = popen.stderr.read()
             output = popen.stdout.read()
+            output_error = popen.stderr.read()
 
             timelines = output_error.strip().splitlines()[-3:]
             times = {}
@@ -148,6 +149,7 @@
         for name, opts, code in (('site', '', 'pass'), ('nosite', '-S', 'pass'),
                 ('importos', '-S', "import os"),
                 ('importdecimal', '-S', "import decimal"),
+                ('importoptparse', '-S', "import optparse"),
             ):
             executable = py.path.local.sysfind(self.executable)
             p = self.tmpdir.join("launcher.py")