Author: mattip <matti.pi...@gmail.com>
Branch: 
Changeset: r77003:c70e01ca8149
Date: 2015-05-03 18:11 +0300
http://bitbucket.org/pypy/pypy/changeset/c70e01ca8149/

Log:    fix own tests

diff --git a/pypy/module/_vmprof/interp_vmprof.py 
b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -27,7 +27,7 @@
     include_dirs = [SRC],
     includes = ['vmprof.h', 'trampoline.h'],
     separate_module_files = [SRC.join('trampoline.asmgcc.s')],
-    link_files = ['-Wl,-Bstatic', '-lunwind', '-Wl,-Bdynamic'],
+    link_files = ['-Wl,-Bstatic', '-lunwind', '-llzma','-Wl,-Bdynamic'],
     
     post_include_bits=["""
         void pypy_vmprof_init(void);
diff --git a/pypy/module/_vmprof/test/test_direct.py 
b/pypy/module/_vmprof/test/test_direct.py
--- a/pypy/module/_vmprof/test/test_direct.py
+++ b/pypy/module/_vmprof/test/test_direct.py
@@ -1,5 +1,9 @@
 
-import cffi, py
+import py
+try:
+    import cffi
+except ImportError:
+    py.test.skip('cffi required')
 
 srcdir = py.path.local(__file__).join("..", "..", "src")
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to