Author: Matti Picus <[email protected]>
Branch: cpyext-injection
Changeset: r88389:c5f1e4703974
Date: 2016-11-15 19:30 +0200
http://bitbucket.org/pypy/pypy/changeset/c5f1e4703974/
Log: fix tests for -A
diff --git a/pypy/module/cpyext/injection/test/test_injection.py
b/pypy/module/cpyext/injection/test/test_injection.py
--- a/pypy/module/cpyext/injection/test/test_injection.py
+++ b/pypy/module/cpyext/injection/test/test_injection.py
@@ -1,10 +1,13 @@
from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
from pypy.module.cpyext.pyobject import _has_a_pyobj
from pypy.interpreter.gateway import interp2app
+from pypy.conftest import option
class AppTestTypeObject(AppTestCpythonExtensionBase):
def setup_class(cls):
+ if option.runappdirect:
+ skip('untranslated only')
def is_there_an_pyobj_version(space, w_obj):
if _has_a_pyobj(space, w_obj):
return space.w_True
diff --git a/pypy/module/cpyext/test/test_cpyext.py
b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -233,7 +233,7 @@
else:
def w_import_module(self, name, init=None, body='', filename=None,
include_dirs=None, PY_SSIZE_T_CLEAN=False):
- from extbuild import get_sys_info_app
+ from pypy.tool.cpyext.extbuild import get_sys_info_app
sys_info = get_sys_info_app(self.udir)
return sys_info.import_module(
name, init=init, body=body, filename=filename,
@@ -243,7 +243,7 @@
def w_import_extension(self, modname, functions, prologue="",
include_dirs=None, more_init="", PY_SSIZE_T_CLEAN=False):
- from extbuild import get_sys_info_app
+ from pypy.tool.cpyext.extbuild import get_sys_info_app
sys_info = get_sys_info_app(self.udir)
return sys_info.import_extension(
modname, functions, prologue=prologue,
@@ -253,14 +253,14 @@
def w_compile_module(self, name,
source_files=None, source_strings=None):
- from extbuild import get_sys_info_app
+ from pypy.tool.cpyext.extbuild import get_sys_info_app
sys_info = get_sys_info_app(self.udir)
return sys_info.compile_extension_module(name,
source_files=source_files, source_strings=source_strings)
cls.w_compile_module = w_compile_module
def w_load_module(self, mod, name):
- from extbuild import get_sys_info_app
+ from pypy.tool.cpyext.extbuild import get_sys_info_app
sys_info = get_sys_info_app(self.udir)
return sys_info.load_module(mod, name)
cls.w_load_module = w_load_module
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit