[pypy-commit] pypy py3.5: merge default into py3.5
mattip
pypy.commits at gmail.com
Sat Oct 7 09:23:00 EDT 2017
Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r92633:e3a0b4e339d0
Date: 2017-10-08 00:21 +1100
http://bitbucket.org/pypy/pypy/changeset/e3a0b4e339d0/
Log: merge default into py3.5
diff --git a/pypy/module/_cppyy/test/conftest.py b/pypy/module/_cppyy/test/conftest.py
--- a/pypy/module/_cppyy/test/conftest.py
+++ b/pypy/module/_cppyy/test/conftest.py
@@ -4,7 +4,7 @@
def pytest_runtest_setup(item):
if py.path.local.sysfind('genreflex') is None:
import pypy.module._cppyy.capi.loadable_capi as lcapi
- if 'dummy' in lcapi.reflection_library:
+ if 'dummy' in lcapi.backend_library:
# run only tests that are covered by the dummy backend and tests
# that do not rely on reflex
import os
@@ -33,7 +33,7 @@
import pypy.module._cppyy.capi.loadable_capi as lcapi
try:
import ctypes
- ctypes.CDLL(lcapi.reflection_library)
+ ctypes.CDLL(lcapi.backend_library)
except Exception as e:
if config.option.runappdirect:
return # "can't run dummy tests in -A"
@@ -71,4 +71,4 @@
return
raise
- lcapi.reflection_library = str(soname)
+ lcapi.backend_library = str(soname)
More information about the pypy-commit
mailing list