[pypy-svn] r58712 - pypy/branch/2.5-merge/lib-python

[arigo at codespeak.net]

Author: arigo
Date: Tue Oct  7 12:12:44 2008
New Revision: 58712

Modified:
   pypy/branch/2.5-merge/lib-python/conftest.py
Log:
Re-add support for "-k core".


Modified: pypy/branch/2.5-merge/lib-python/conftest.py
==============================================================================
--- pypy/branch/2.5-merge/lib-python/conftest.py	(original)
+++ pypy/branch/2.5-merge/lib-python/conftest.py	Tue Oct  7 12:12:44 2008
@@ -74,15 +74,6 @@
         return self._compiler #or pypy_option.compiler 
     compiler = property(compiler)
 
-    def getoptions(self): 
-        l = []
-        for name in ['core']:
-            if getattr(self, name): 
-                l.append(name)
-        for name in self.usemodules: 
-            l.append(name)
-        return l 
-
     def ismodified(self): 
         return modregrtestdir.join(self.basename).check() 
 
@@ -671,6 +662,13 @@
         
         return exit_status, test_stdout, test_stderr
 
+    def _keywords(self):
+        lst = list(py.test.collect.Item._keywords(self))
+        regrtest = self.parent.regrtest
+        if regrtest.core:
+            lst.append('core')
+        return lst
+
 #
 # Sanity check  (could be done more nicely too)
 #