[pypy-commit] pypy default: merge upstream

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: 
Changeset: r64671:fc8a329d4956
Date: 2013-05-30 12:41 -0700
http://bitbucket.org/pypy/pypy/changeset/fc8a329d4956/

Log:	merge upstream

diff --git a/pypy/module/pypyjit/test_pypy_c/test_bug.py b/pypy/module/pypyjit/test_pypy_c/test_bug.py
--- a/pypy/module/pypyjit/test_pypy_c/test_bug.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_bug.py
@@ -6,6 +6,11 @@
 def test_bug1():
     if not sys.platform.startswith('linux'):
         py.test.skip("linux-only test")
+    if '__pypy__' not in sys.builtin_module_names:
+        try:
+            import cffi
+        except ImportError, e:
+            py.test.skip(str(e))
 
     cmdline = ['taskset', '-c', '0',
                sys.executable, os.path.join(localdir, 'bug1.py')]