[pypy-svn] r11515 - pypy/dist/lib-python-2.3.4/test

[hpk at codespeak.net]

Author: hpk
Date: Wed Apr 27 15:00:49 2005
New Revision: 11515

Modified:
   pypy/dist/lib-python-2.3.4/test/conftest.py
Log:
respect oldstyle specification in testmap 
for new subprocess runner 



Modified: pypy/dist/lib-python-2.3.4/test/conftest.py
==============================================================================
--- pypy/dist/lib-python-2.3.4/test/conftest.py	(original)
+++ pypy/dist/lib-python-2.3.4/test/conftest.py	Wed Apr 27 15:00:49 2005
@@ -572,6 +572,9 @@
     'test_pep247.py'         : TestDecl(False, SimpleRunModule),
     'test_pep263.py'         : TestDecl(False, SimpleRunModule),
     'test_pep277.py'         : TestDecl(False, UTTestMainModule),
+        # XXX this test is _also_ an output test, damn it 
+        #     seems to be the only one that invokes run_unittest 
+        #     and is an unittest 
     'test_pickle.py'         : TestDecl(False, UTTestMainModule),
     'test_pickletools.py'    : TestDecl(False, SimpleRunModule),
     'test_pkg.py'            : TestDecl(False, OutputTestModule),
@@ -800,8 +803,12 @@
         pypy_dir = py.path.local(pypy.__file__).dirpath()
         pypy_script = pypy_dir.join('interpreter', 'py.py')
         alarm_script = pypy_dir.join('tool', 'alarm.py')
+        pypy_options = []
+        if self.testdecl.oldstyle: 
+            pypy_options.append('--oldstyle') 
+        sopt = " ".join(pypy_options) 
         TIMEOUT = option.timeout 
-        cmd = "%s %s %d %s %s" %(python, alarm_script, TIMEOUT, pypy_script, fspath)
+        cmd = "%s %s %d %s %s %s" %(python, alarm_script, TIMEOUT, pypy_script, sopt, fspath)
         resultfilename = mydir.join('result', fspath.new(ext='.txt').basename)
         resultfile = resultfilename.open('w')