[pypy-svn] r17878 - pypy/dist/lib-python

[ac at codespeak.net]

Author: ac
Date: Mon Sep 26 16:54:09 2005
New Revision: 17878

Modified:
   pypy/dist/lib-python/conftest.py
Log:
Allow --compiler option to py.test for compliance tests.

Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Mon Sep 26 16:54:09 2005
@@ -295,7 +295,7 @@
         self._oldstyle = oldstyle 
         self._uselibfile = uselibfile
         self._usemodules = usemodules.split()
-        self.compiler = compiler 
+        self._compiler = compiler 
         self.core = core
 
     def oldstyle(self): 
@@ -310,6 +310,10 @@
         return self._usemodules + pypy_option.usemodules
     usemodules = property(usemodules)
 
+    def compiler(self): 
+        return self._compiler or pypy_option.compiler 
+    compiler = property(compiler)
+
     def getoptions(self): 
         l = []
         for name in 'oldstyle', 'core', 'uselibfile':