[pypy-svn] r44960 - in pypy/dist/pypy/rpython/tool: . test

[fijal at codespeak.net]

Author: fijal
Date: Thu Jul 12 15:08:13 2007
New Revision: 44960

Modified:
   pypy/dist/pypy/rpython/tool/mkrffi.py
   pypy/dist/pypy/rpython/tool/test/test_mkrffi.py
Log:
Make test a bit more regular (but still quite vague)


Modified: pypy/dist/pypy/rpython/tool/mkrffi.py
==============================================================================
--- pypy/dist/pypy/rpython/tool/mkrffi.py	(original)
+++ pypy/dist/pypy/rpython/tool/mkrffi.py	Thu Jul 12 15:08:13 2007
@@ -10,7 +10,7 @@
     name = func.__name__
     src = Source("""
     c_%s = rffi.llexternal('%s', [rffi.INT], 
-          lltype.Ptr(lltype.FixedSizeArray(lltype.Void, 1)))
+    lltype.Ptr(lltype.FixedSizeArray(lltype.Void, 1)))
     """%(name, name))
     return src
 

Modified: pypy/dist/pypy/rpython/tool/test/test_mkrffi.py
==============================================================================
--- pypy/dist/pypy/rpython/tool/test/test_mkrffi.py	(original)
+++ pypy/dist/pypy/rpython/tool/test/test_mkrffi.py	Thu Jul 12 15:08:13 2007
@@ -1,19 +1,19 @@
 
 import ctypes
 from pypy.rpython.tool.mkrffi import *
+from pypy.rpython.tool.test.test_c import TestBasic
 
-def test_func():
+class TestMkrffi(TestBasic):
+    def test_single_func(self):
+        func = self.lib.int_to_void_p
+        func.argtypes = [ctypes.c_int]
+        func.restype = ctypes.c_voidp
 
-    lib = ctypes.CDLL('libc.so.6')
-    func = lib.malloc
-    func.argtypes = [ctypes.c_int]
-    func.restype = ctypes.c_voidp
+        src = proc_func(func)
+        assert isinstance(src, Source)
+        _src = Source("""
+        c_int_to_void_p = rffi.llexternal('int_to_void_p', [rffi.INT], 
+        lltype.Ptr(lltype.FixedSizeArray(lltype.Void, 1)))
+        """)
 
-    src = proc_func(func)
-    assert isinstance(src, Source)
-    _src = Source("""
-    c_malloc = rffi.llexternal('malloc', [rffi.INT], 
-          lltype.Ptr(lltype.FixedSizeArray(lltype.Void, 1)))
-    """)
-
-    assert src == _src
+        assert src == _src, str(src) + "\n" + str(_src)