[pypy-svn] r20992 - in pypy/dist: lib-python pypy/tool/pytest pypy/tool/pytest/run-script

[hpk at codespeak.net]

Author: hpk
Date: Sat Dec 10 11:47:30 2005
New Revision: 20992

Added:
   pypy/dist/pypy/tool/pytest/run-script/
   pypy/dist/pypy/tool/pytest/run-script/regrverbose.py
      - copied, changed from r20991, pypy/dist/pypy/tool/pytest/regrverbose.py
Removed:
   pypy/dist/pypy/tool/pytest/regrverbose.py
Modified:
   pypy/dist/lib-python/conftest.py
Log:
fix compliance test run problem 
- the problem arose because pypy is now properly 
  inserting the basedirectory of a script-to-be-run 
  into sys.path so that "import test" now found the 
  local pypy/tool/pytest/test instead of the stdlib one. 

- so i moved the regrverbose script into its own 
  directory (run-script) for now and reverted 
  armin's argh-fix 



Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Sat Dec 10 11:47:30 2005
@@ -886,7 +886,8 @@
         python = sys.executable 
         pypy_script = pypydir.join('bin', 'py.py')
         alarm_script = pypydir.join('tool', 'alarm.py')
-        regr_script = pypydir.join('tool', 'pytest', 'regrverbose.py')
+        regr_script = pypydir.join('tool', 'pytest', 
+                                   'run-script', 'regrverbose.py')
         pypy_options = []
         if regrtest.oldstyle: 
             pypy_options.append('--oldstyle')