[pypy-svn] r26216 - in pypy/dist/pypy/translator/cl: . test

[nik at codespeak.net]

Author: nik
Date: Mon Apr 24 04:54:28 2006
New Revision: 26216

Modified:
   pypy/dist/pypy/translator/cl/buildcl.py
   pypy/dist/pypy/translator/cl/test/test_cltrans.py
Log:
(nik, sanxiyn, yusei)
moved py.test skipping into translation function to get rid of test boilerplate.


Modified: pypy/dist/pypy/translator/cl/buildcl.py
==============================================================================
--- pypy/dist/pypy/translator/cl/buildcl.py	(original)
+++ pypy/dist/pypy/translator/cl/buildcl.py	Mon Apr 24 04:54:28 2006
@@ -2,12 +2,15 @@
 import os
 import py
 
+from pypy.tool.udir import udir
 from pypy.objspace.flow import FlowObjSpace
 from pypy.translator.translator import TranslationContext
 from pypy.translator.cl.gencl import GenCL
 from py.process import cmdexec 
 from pypy import conftest
 
+global_cl = None
+
 def is_on_path(name):
     try:
         py.path.local.sysfind(name)
@@ -62,6 +65,14 @@
             content = "'" + content # quote Lisp list
         return content
 
+def make_cl_func(func, argtypes=[]):
+    global global_cl
+    if global_cl is None:
+        global_cl = cl_detect()
+    if not global_cl:
+        py.test.skip("Common Lisp neither configured nor detected.")
+    return _make_cl_func(func, global_cl, udir, argtypes)
+
 def _make_cl_func(func, cl, path, argtypes=[]):
     t = TranslationContext()
     t.buildannotator().build_types(func, argtypes)

Modified: pypy/dist/pypy/translator/cl/test/test_cltrans.py
==============================================================================
--- pypy/dist/pypy/translator/cl/test/test_cltrans.py	(original)
+++ pypy/dist/pypy/translator/cl/test/test_cltrans.py	Mon Apr 24 04:54:28 2006
@@ -1,29 +1,14 @@
 import autopath
-from pypy.tool.udir import udir
 import py 
 import os
-from pypy.objspace.flow import FlowObjSpace 
 
-
-from pypy.translator.cl.buildcl import cl_detect, _make_cl_func
+from pypy.translator.cl.buildcl import make_cl_func
 from pypy.translator.cl.buildcl import Literal
 
-def setup_module(mod): 
-    mod.global_cl = cl_detect()
-
-def make_cl_func(func, argtypes=[]):
-    return _make_cl_func(func, global_cl, udir, argtypes)
-
-
 from pypy.translator.test import snippet as t
 
-class TestGenCLTestCase:
-    def setup_class(cls): 
-        cls.space = FlowObjSpace() 
 
-    def setup_method(self,method):
-        if not global_cl:
-            py.test.skip("Common Lisp neither configured nor detected.")
+class TestGenCLTestCase:
 
     def test_if(self):
         py.test.skip("temporarily disabled")