[pypy-svn] r26423 - pypy/dist/pypy/translator/squeak/test

[nik at codespeak.net]

Author: nik
Date: Thu Apr 27 10:59:44 2006
New Revision: 26423

Modified:
   pypy/dist/pypy/translator/squeak/test/runtest.py
Log:
cleaner checking of squeak-specific py.test options, as done in
the lisp backend now.


Modified: pypy/dist/pypy/translator/squeak/test/runtest.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/test/runtest.py	(original)
+++ pypy/dist/pypy/translator/squeak/test/runtest.py	Thu Apr 27 10:59:44 2006
@@ -4,6 +4,7 @@
 from pypy.translator.squeak.gensqueak import GenSqueak, camel_case
 from pypy.translator.translator import TranslationContext
 from pypy import conftest
+from pypy.translator.squeak import conftest as sqconftest
 
 def compile_function(func, annotation=[], graph=None):
     return SqueakFunction(func, annotation, graph)
@@ -93,7 +94,7 @@
         # NB: only integers arguments are supported currently
         startup_st = self._write_startup()
         options = "-headless"
-        if hasattr(conftest, "showsqueak") and conftest.option.showsqueak:
+        if sqconftest.option.showsqueak:
             options = ""
         cmd = 'squeak %s -- %s %s "%s" %s' \
                 % (options, startup_st, udir.join(self._gen.filename),