[pypy-svn] r25510 - in pypy/dist/pypy: . jit/tl/test rpython/l3interp/test translator/c/test translator/pyrex/test translator/test translator/tool
arigo at codespeak.net
arigo at codespeak.net
Fri Apr 7 17:22:10 CEST 2006
Author: arigo
Date: Fri Apr 7 17:22:06 2006
New Revision: 25510
Modified:
pypy/dist/pypy/conftest.py
pypy/dist/pypy/jit/tl/test/test_tl.py
pypy/dist/pypy/rpython/l3interp/test/test_l3interp.py
pypy/dist/pypy/translator/c/test/test_boehm.py
pypy/dist/pypy/translator/c/test/test_exceptiontransform.py
pypy/dist/pypy/translator/c/test/test_newgc.py
pypy/dist/pypy/translator/c/test/test_typed.py
pypy/dist/pypy/translator/pyrex/test/test_pyrextrans.py
pypy/dist/pypy/translator/test/test_geninterp.py
pypy/dist/pypy/translator/tool/cbuild.py
Log:
(arre, arigo)
Removed skip_missing_compiler(). Test for this situation in conftest instead.
Modified: pypy/dist/pypy/conftest.py
==============================================================================
--- pypy/dist/pypy/conftest.py (original)
+++ pypy/dist/pypy/conftest.py Fri Apr 7 17:22:06 2006
@@ -180,6 +180,15 @@
except OperationError, e:
check_keyboard_interrupt(e)
raise
+ except Exception, e:
+ cls = e.__class__
+ while cls is not Exception:
+ if cls.__name__ == 'DistutilsPlatformError':
+ from distutils.errors import DistutilsPlatformError
+ if isinstance(e, DistutilsPlatformError):
+ py.test.skip('%s: %s' % (e.__class__.__name__, e))
+ cls = cls.__bases__[0]
+ raise
if 'pygame' in sys.modules:
global _pygame_imported
if not _pygame_imported:
Modified: pypy/dist/pypy/jit/tl/test/test_tl.py
==============================================================================
--- pypy/dist/pypy/jit/tl/test/test_tl.py (original)
+++ pypy/dist/pypy/jit/tl/test/test_tl.py Fri Apr 7 17:22:06 2006
@@ -13,11 +13,10 @@
t.buildannotator(policy=pol).build_types(func, inputargs)
t.buildrtyper().specialize()
- from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.c import genc
builder = genc.CExtModuleBuilder(t, func)
builder.generate_source()
- skip_missing_compiler(builder.compile)
+ builder.compile()
builder.import_module()
return builder.get_entry_point()
Modified: pypy/dist/pypy/rpython/l3interp/test/test_l3interp.py
==============================================================================
--- pypy/dist/pypy/rpython/l3interp/test/test_l3interp.py (original)
+++ pypy/dist/pypy/rpython/l3interp/test/test_l3interp.py Fri Apr 7 17:22:06 2006
@@ -24,11 +24,10 @@
if conftest.option.view:
t.view()
- from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.c import genc
builder = genc.CExtModuleBuilder(t, func, gcpolicy=BoehmGcPolicy)
builder.generate_source()
- skip_missing_compiler(builder.compile)
+ builder.compile()
builder.isolated_import()
_cleanups.append(builder.cleanup)
return builder.get_entry_point()
Modified: pypy/dist/pypy/translator/c/test/test_boehm.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_boehm.py (original)
+++ pypy/dist/pypy/translator/c/test/test_boehm.py Fri Apr 7 17:22:06 2006
@@ -1,6 +1,6 @@
import py
from pypy.translator.translator import TranslationContext
-from pypy.translator.tool.cbuild import skip_missing_compiler, check_boehm_presence
+from pypy.translator.tool.cbuild import check_boehm_presence
from pypy.translator.c.genc import CExtModuleBuilder
from pypy import conftest
@@ -39,7 +39,7 @@
mod = cbuilder.isolated_import()
self._cleanups.append(cbuilder.cleanup) # schedule cleanup after test
return cbuilder.get_entry_point()
- return skip_missing_compiler(compile)
+ return compile()
class TestUsingBoehm(AbstractTestClass):
Modified: pypy/dist/pypy/translator/c/test/test_exceptiontransform.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_exceptiontransform.py (original)
+++ pypy/dist/pypy/translator/c/test/test_exceptiontransform.py Fri Apr 7 17:22:06 2006
@@ -4,7 +4,6 @@
from pypy.translator.c import exceptiontransform, genc, gc
from pypy.objspace.flow.model import c_last_exception
from pypy.rpython.test.test_llinterp import get_interpreter
-from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy import conftest
import sys
@@ -48,7 +47,7 @@
## etrafo.transform_completely()
builder = genc.CExtModuleBuilder(t, fn, gcpolicy=gc.RefcountingGcPolicy)
builder.generate_source()
- skip_missing_compiler(builder.compile)
+ builder.compile()
builder.import_module()
if conftest.option.view:
t.view()
Modified: pypy/dist/pypy/translator/c/test/test_newgc.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_newgc.py (original)
+++ pypy/dist/pypy/translator/c/test/test_newgc.py Fri Apr 7 17:22:06 2006
@@ -3,7 +3,6 @@
import py
from py.test import raises
-from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.translator import TranslationContext
from pypy.translator.c import genc, gc
from pypy.rpython.lltypesystem import lltype
@@ -18,7 +17,7 @@
t.buildrtyper().specialize()
builder = genc.CExtModuleBuilder(t, fn, gcpolicy=gc.RefcountingGcPolicy)
builder.generate_source()
- skip_missing_compiler(builder.compile)
+ builder.compile()
builder.import_module()
if conftest.option.view:
t.view()
Modified: pypy/dist/pypy/translator/c/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_typed.py (original)
+++ pypy/dist/pypy/translator/c/test/test_typed.py Fri Apr 7 17:22:06 2006
@@ -6,7 +6,6 @@
from pypy import conftest
from pypy.translator.test import snippet
-from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.translator import TranslationContext
from pypy.rpython.rarithmetic import r_uint, r_ulonglong, r_longlong, intmask
@@ -34,7 +33,7 @@
from pypy.translator.c import genc
builder = genc.CExtModuleBuilder(t, func)
builder.generate_source()
- skip_missing_compiler(builder.compile)
+ builder.compile()
builder.import_module()
return builder.get_entry_point()
Modified: pypy/dist/pypy/translator/pyrex/test/test_pyrextrans.py
==============================================================================
--- pypy/dist/pypy/translator/pyrex/test/test_pyrextrans.py (original)
+++ pypy/dist/pypy/translator/pyrex/test/test_pyrextrans.py Fri Apr 7 17:22:06 2006
@@ -5,7 +5,6 @@
from pypy.objspace.flow.model import *
from pypy.translator.tool.cbuild import build_cfunc
from pypy.translator.tool.cbuild import make_module_from_pyxstring
-from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.translator import TranslationContext
from pypy.objspace.flow import FlowObjSpace
@@ -32,7 +31,7 @@
'simplify' : 1,
'dot' : dot,
}
- return skip_missing_compiler(build_cfunc, func, **options)
+ return build_cfunc(func, **options)
def test_simple_func(self):
cfunc = self.build_cfunc(snippet.simple_func)
@@ -136,8 +135,7 @@
blobs.insert(0, code)
pyxcode = '\n\n#_________________\n\n'.join(blobs)
- mod = skip_missing_compiler(
- make_module_from_pyxstring, name, udir, pyxcode)
+ mod = make_module_from_pyxstring(name, udir, pyxcode)
return getattr(mod, name)
def test_set_attr(self):
Modified: pypy/dist/pypy/translator/test/test_geninterp.py
==============================================================================
--- pypy/dist/pypy/translator/test/test_geninterp.py (original)
+++ pypy/dist/pypy/translator/test/test_geninterp.py Fri Apr 7 17:22:06 2006
@@ -28,7 +28,6 @@
from pypy.tool.udir import udir
from pypy.objspace.flow.model import *
from pypy.translator.tool.cbuild import make_module_from_c
-from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.geninterplevel import translate_as_module
from pypy.translator.test import snippet
from pypy.interpreter.error import OperationError
Modified: pypy/dist/pypy/translator/tool/cbuild.py
==============================================================================
--- pypy/dist/pypy/translator/tool/cbuild.py (original)
+++ pypy/dist/pypy/translator/tool/cbuild.py Fri Apr 7 17:22:06 2006
@@ -188,13 +188,6 @@
cfile = pyxfile.new(ext='.c')
return cfile
-def skip_missing_compiler(fn, *args, **kwds):
- from distutils.errors import DistutilsPlatformError
- try:
- return fn(*args, **kwds)
- except DistutilsPlatformError, e:
- py.test.skip('DistutilsPlatformError: %s' % (e,))
-
def build_cfunc(func, simplify=1, dot=1, inputargtypes=None):
""" return a pyrex-generated cfunction from the given func.
More information about the Pypy-commit
mailing list