[pypy-commit] cffi cffi-1.0: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: cffi-1.0
Changeset: r1942:23a206da071b
Date: 2015-05-09 12:01 +0200
http://bitbucket.org/cffi/cffi/changeset/23a206da071b/

Log:	merge heads

diff --git a/_cffi1/test_cffi_binary.py b/_cffi1/test_cffi_binary.py
--- a/_cffi1/test_cffi_binary.py
+++ b/_cffi1/test_cffi_binary.py
@@ -2,6 +2,8 @@
 import _cffi_backend
 
 def test_no_unknown_exported_symbols():
+    if not hasattr(_cffi_backend, '__file__'):
+        py.test.skip("_cffi_backend module is built-in")
     if not sys.platform.startswith('linux'):
         py.test.skip("linux-only")
     g = os.popen("objdump -T '%s'" % _cffi_backend.__file__, 'r')