[pypy-svn] r70464 - pypy/trunk/pypy/translator/benchmark

[arigo at codespeak.net]

Author: arigo
Date: Fri Jan  8 23:11:29 2010
New Revision: 70464

Modified:
   pypy/trunk/pypy/translator/benchmark/bench-custom.py
   pypy/trunk/pypy/translator/benchmark/jitbench.py
Log:
Print errors to stdout instead of sending them to SystemExit to avoid
a broken order of output (they are printed to stderr in that case).


Modified: pypy/trunk/pypy/translator/benchmark/bench-custom.py
==============================================================================
--- pypy/trunk/pypy/translator/benchmark/bench-custom.py	(original)
+++ pypy/trunk/pypy/translator/benchmark/bench-custom.py	Fri Jan  8 23:11:29 2010
@@ -88,7 +88,8 @@
             print
 
     if final_error_count:
-        raise SystemExit("%d benchmark run(s) failed" % final_error_count)
+        raise SystemExit("%d benchmark run(s) failed (see -FAILED- above)"
+                         % final_error_count)
 
 if __name__ == '__main__':
     from optparse import OptionParser

Modified: pypy/trunk/pypy/translator/benchmark/jitbench.py
==============================================================================
--- pypy/trunk/pypy/translator/benchmark/jitbench.py	(original)
+++ pypy/trunk/pypy/translator/benchmark/jitbench.py	Fri Jan  8 23:11:29 2010
@@ -23,7 +23,8 @@
         try:
             execfile('bench-custom.py')
         except SystemExit, e:
-            errors.append(str(e))
+            errors.append('%s:*%s: %s' % (executable, sizefactor, e))
 
 if errors:
-    raise SystemExit('\n'.join(errors))
+    print '\n'.join(errors)
+    sys.exit(1)