[pypy-svn] r77338 - in pypy/branch/fast-forward: lib-python pypy/tool/pytest/run-script

[afa at codespeak.net]

Author: afa
Date: Fri Sep 24 13:36:23 2010
New Revision: 77338

Modified:
   pypy/branch/fast-forward/lib-python/conftest.py
   pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
Log:
Always run regression tests in verbose mode.
py.test hides the output anyway while running, and will give more informative results in reports.


Modified: pypy/branch/fast-forward/lib-python/conftest.py
==============================================================================
--- pypy/branch/fast-forward/lib-python/conftest.py	(original)
+++ pypy/branch/fast-forward/lib-python/conftest.py	Fri Sep 24 13:36:23 2010
@@ -613,10 +613,6 @@
                                    'run-script', 'regrverbose.py')
         
         regrrun = str(regr_script)
-        if pypy_option.verbose:
-            regrrun_verbosity = '1'
-        else:
-            regrrun_verbosity = '0'
         
         TIMEOUT = gettimeout()
         if option.pypy:
@@ -634,9 +630,9 @@
                     py.test.skip("%s module not included in %s" % (mod,
                                                                    execpath))
                     
-            cmd = "%s %s %s %s" %(
+            cmd = "%s %s %s" %(
                 execpath, 
-                regrrun, regrrun_verbosity, fspath.purebasename)
+                regrrun, fspath.purebasename)
 
             # add watchdog for timing out
             cmd = "%s %s %s %s" %(

Modified: pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
==============================================================================
--- pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py	(original)
+++ pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py	Fri Sep 24 13:36:23 2010
@@ -2,8 +2,8 @@
 import sys
 import unittest
 from test import test_support
-test_support.verbose = int(sys.argv[1])
-sys.argv[:] = sys.argv[2:]
+test_support.verbose = 1
+sys.argv[:] = sys.argv[1:]
 
 modname = sys.argv[0]
 impname = 'test.' + modname