[pypy-svn] r45595 - in pypy/dist/pypy/module/thread: . test

[fijal at codespeak.net]

Author: fijal
Date: Sat Aug 11 11:46:22 2007
New Revision: 45595

Modified:
   pypy/dist/pypy/module/thread/ll_thread.py
   pypy/dist/pypy/module/thread/test/test_ll_thread.py
Log:
* skip non-working test
* fix include_dirs problem


Modified: pypy/dist/pypy/module/thread/ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/ll_thread.py	(original)
+++ pypy/dist/pypy/module/thread/ll_thread.py	Sat Aug 11 11:46:22 2007
@@ -17,12 +17,12 @@
     def __init__(self, msg):
         self.msg = msg
 
-includes = ['unistd.h', 'src/thread.h']
+from pypy.tool.autopath import pypydir
+pypydir = py.path.local(pypydir)
+srcdir = pypydir.join('translator', 'c', 'src')
+includes = ['unistd.h', 'thread.h']
 
 def setup_thread_so():
-    from pypy.tool.autopath import pypydir
-    pypydir = py.path.local(pypydir)
-    srcdir = pypydir.join('translator', 'c', 'src')
     files = [srcdir.join('thread.c')]
     modname = '_thread'
     cache_c_module(files, modname, include_dirs=[str(srcdir)])
@@ -31,7 +31,7 @@
 
 def llexternal(name, args, result):
     return rffi.llexternal(name, args, result, includes=includes,
-                           libraries=libraries)
+                           libraries=libraries, include_dirs=[str(srcdir)])
 
 CALLBACK = lltype.Ptr(lltype.FuncType([rffi.VOIDP], rffi.VOIDP))
 c_thread_start = llexternal('RPyThreadStart', [CALLBACK, rffi.VOIDP], rffi.INT)

Modified: pypy/dist/pypy/module/thread/test/test_ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/test/test_ll_thread.py	(original)
+++ pypy/dist/pypy/module/thread/test/test_ll_thread.py	Sat Aug 11 11:46:22 2007
@@ -47,6 +47,7 @@
     assert fn() == False
 
 def test_prebuilt_lock():
+    py.test.skip("Does not work (prebuilt opaque object)")
     l = allocate_lock()
 
     def f():