[pypy-commit] cffi static-callback: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: static-callback
Changeset: r2408:bbc42a0625ee
Date: 2015-11-16 12:26 +0100
http://bitbucket.org/cffi/cffi/changeset/bbc42a0625ee/

Log:	hg merge default

diff --git a/testing/cffi1/test_commontypes.py b/testing/cffi1/test_commontypes.py
--- a/testing/cffi1/test_commontypes.py
+++ b/testing/cffi1/test_commontypes.py
@@ -3,8 +3,11 @@
 
 
 def getlines():
-    f = open(os.path.join(os.path.dirname(cffi.__file__),
-                          '..', 'c', 'commontypes.c'))
+    try:
+        f = open(os.path.join(os.path.dirname(cffi.__file__),
+                              '..', 'c', 'commontypes.c'))
+    except IOError:
+        py.test.skip("cannot find ../c/commontypes.c")
     lines = [line for line in f.readlines() if line.strip().startswith('EQ(')]
     f.close()
     return lines