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

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Feb  9 14:05:09 2007
New Revision: 38248

Added:
   pypy/dist/pypy/tool/watchdog.py
      - copied unchanged from r38247, user/pedronis/watchdog/watchdog.py
Modified:
   pypy/dist/lib-python/conftest.py
Log:
trying simple timeout watchdog approach



Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Fri Feb  9 14:05:09 2007
@@ -881,8 +881,11 @@
         python = sys.executable 
         pypy_script = pypydir.join('bin', 'py.py')
         alarm_script = pypydir.join('tool', 'alarm.py')
+        watchdog_script = pypydir.join('tool', 'watchdog.py')
+
         regr_script = pypydir.join('tool', 'pytest', 
                                    'run-script', 'regrverbose.py')
+        
         if option.use_compiled:
             execpath, info = getexecutable()        
         pypy_options = []
@@ -908,7 +911,10 @@
             cmd = "%s %s %s %s" %(
                 execpath, 
                 regrrun, regrrun_verbosity, fspath.purebasename)
-            print cmd
+            if sys.platform != 'win32':
+                cmd = "%s %s %s %s" %(
+                       python, watchdog_script, TIMEOUT,
+                       cmd)
         else:
             cmd = "%s %s %d %s %s %s %s %s" %(
                 python, alarm_script, TIMEOUT,