[pypy-svn] r25002 - in pypy/dist/pypy/translator/cli: . test

[antocuni at codespeak.net]

Author: antocuni
Date: Sat Mar 25 20:16:12 2006
New Revision: 25002

Modified:
   pypy/dist/pypy/translator/cli/conftest.py
   pypy/dist/pypy/translator/cli/test/runtest.py
Log:
Fixed conftest-related bug


Modified: pypy/dist/pypy/translator/cli/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/cli/conftest.py	(original)
+++ pypy/dist/pypy/translator/cli/conftest.py	Sat Mar 25 20:16:12 2006
@@ -1,5 +1,4 @@
 import py
-from pypy import conftest
 
 Option = py.test.Config.Option
 

Modified: pypy/dist/pypy/translator/cli/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/runtest.py	(original)
+++ pypy/dist/pypy/translator/cli/test/runtest.py	Sat Mar 25 20:16:12 2006
@@ -6,6 +6,7 @@
 from pypy.tool.udir import udir
 from pypy.translator.translator import TranslationContext
 from pypy.translator.cli import conftest
+from pypy.conftest import option
 from pypy.translator.cli.gencli import GenCli
 from pypy.translator.cli.function import Node
 from pypy.translator.cli.cts import graph_to_signature
@@ -94,10 +95,10 @@
         t.buildrtyper(type_system="ootype").specialize()
         self.graph = t.graphs[0]
 
-        if conftest.option.view:
+        if option.view:
            t.viewcg()
 
-        if conftest.option.wd:
+        if option.wd:
             tmpdir = py.path.local('.')
         else:
             tmpdir = udir
@@ -119,7 +120,7 @@
 
     def _build_exe(self):        
         tmpfile = self._gen.generate_source()
-        if conftest.option.source:
+        if option.source:
             return None
 
         self.__check_helper("ilasm")