[pypy-svn] r11795 - in pypy/dist: lib-python pypy/tool/pytest

[hpk at codespeak.net]

Author: hpk
Date: Mon May  2 18:10:57 2005
New Revision: 11795

Added:
   pypy/dist/pypy/tool/pytest/regrverbose.py
Modified:
   pypy/dist/lib-python/conftest.py
Log:
run non-verbose for output tests 


Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Mon May  2 18:10:57 2005
@@ -792,6 +792,7 @@
         python = sys.executable 
         pypy_script = pypydir.join('interpreter', 'py.py')
         alarm_script = pypydir.join('tool', 'alarm.py')
+        regr_script = pypydir.join('tool', 'pytest', 'regrverbose.py')
         pypy_options = []
         if regrtest.oldstyle or pypy_option.oldstyle: 
             pypy_options.append('--oldstyle') 
@@ -799,8 +800,13 @@
             pypy_options.append('--file') 
         sopt = " ".join(pypy_options) 
 
+        if regrtest.getoutputpath(): 
+            wrap = str(regr_script)
+        else: 
+            wrap = ""
         TIMEOUT = gettimeout()
-        cmd = "%s %s %d %s %s %s" %(python, alarm_script, TIMEOUT, pypy_script, sopt, fspath)
+        cmd = "%s %s %d %s %s %s %s" %(python, alarm_script, TIMEOUT, 
+                pypy_script, wrap, sopt, fspath)
         return cmd 
 
     def run(self): 

Added: pypy/dist/pypy/tool/pytest/regrverbose.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/tool/pytest/regrverbose.py	Mon May  2 18:10:57 2005
@@ -0,0 +1,4 @@
+import sys
+from test import test_support 
+test_support.verbose = False 
+execfile(sys.argv[1])