[pypy-svn] r48103 - pypy/dist/pypy/translator/llvm/test

[rxe at codespeak.net]

Author: rxe
Date: Sat Oct 27 13:55:06 2007
New Revision: 48103

Modified:
   pypy/dist/pypy/translator/llvm/test/test_lladdresses.py
   pypy/dist/pypy/translator/llvm/test/test_rffi.py
   pypy/dist/pypy/translator/llvm/test/test_symbolic.py
   pypy/dist/pypy/translator/llvm/test/test_typed.py
Log:
minor fixes/updates to tests. all pass (on os/x) but that is because all the problem tests have been skipped.

Modified: pypy/dist/pypy/translator/llvm/test/test_lladdresses.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_lladdresses.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_lladdresses.py	Sat Oct 27 13:55:06 2007
@@ -110,22 +110,8 @@
     fn = compile_function(f, [int])
     assert fn(1) == 2 
 
-# def test_flavored_varmalloc_raw():
-#     py.test.skip("test_flavored_varmalloc_raw not working - or maybe it will never to work?")
-#     A = lltype.Array(lltype.Signed)
-#     VARS = lltype.GcStruct('test', ('a', lltype.Signed), ('b', A))
-#     def f(x, y):
-#         #s = lltype.flavored_malloc('gc', VARS, x)
-#         s = lltype.malloc(VARS, n=x, flavor='gc')
-#         s.a = 42
-#         s.b[0] = y * 2
-#         return s.b[0] - s.a
-
-#     fn = compile_function(f, [int, int])
-#     assert fn(2, 24) == 6
-
 def test_flavored_malloc_stack():
-    py.test.skip("Broken and noone wants to fix it")
+    py.test.skip("operation stack_malloc not found")
     class A(object):
         _alloc_flavor_ = "stack"
         def __init__(self, val):

Modified: pypy/dist/pypy/translator/llvm/test/test_rffi.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_rffi.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_rffi.py	Sat Oct 27 13:55:06 2007
@@ -11,6 +11,8 @@
 
 from pypy.translator.llvm.test.runtest import *
 
+py.test.skip("rffi not there yet for llvm")
+
 def test_basic():
     c_source = py.code.Source("""
     int z(int x)

Modified: pypy/dist/pypy/translator/llvm/test/test_symbolic.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_symbolic.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_symbolic.py	Sat Oct 27 13:55:06 2007
@@ -2,7 +2,6 @@
 from pypy.translator.interactive import Translation
 from pypy import conftest
 from pypy.rpython.lltypesystem import llmemory, lltype
-from pypy.rpython.memory import lladdress
 from pypy.rlib.objectmodel import ComputedIntSymbolic
 
 from pypy.translator.llvm.test.runtest import *
@@ -82,11 +81,11 @@
     sizeofs = llmemory.sizeof(STRUCT)
     offsety = llmemory.offsetof(STRUCT, 'y')
     def f():
-        adr = lladdress.raw_malloc(sizeofs)
+        adr = llmemory.raw_malloc(sizeofs)
         s = llmemory.cast_adr_to_ptr(adr, STRUCTPTR)
         s.y = 5 # does not crash
         result = (adr + offsety).signed[0] * 10 + int(offsety < sizeofs)
-        lladdress.raw_free(adr)
+        llmemory.raw_free(adr)
         return result
 
     fn = compile_function(f, [])
@@ -133,7 +132,7 @@
     sizeofsbase = llmemory.sizeof(SBASE)
     offset_toa = offsetofs(SBASE, 'b', 's2', 'a') 
     def complex_struct():
-        adr = lladdress.raw_malloc(sizeofsbase)
+        adr = llmemory.raw_malloc(sizeofsbase)
         s = llmemory.cast_adr_to_ptr(adr, SBASEPTR)
         s.b.s2.a = 42
         return (adr + offset_toa).signed[0]
@@ -167,11 +166,10 @@
     assert fn(21) == 42
 
 def test_itemoffset_void():
-    py.test.skip("not supported")
+    py.test.skip("inprogress")
     A = lltype.GcArray(lltype.Void)
     s = llmemory.sizeof(A, 1)
     s += llmemory.sizeof(lltype.Signed)
-    print s
     def f():
         return s
     fn = compile_function(f, [])

Modified: pypy/dist/pypy/translator/llvm/test/test_typed.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_typed.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_typed.py	Sat Oct 27 13:55:06 2007
@@ -54,7 +54,7 @@
     assert result 
 
 def test_is():
-    py.test.skip("Broken and noone wants to fix it")
+    py.test.skip("inprogress")
     def testfn():
         l1 = []
         return l1 is l1
@@ -69,7 +69,7 @@
     assert result == False
 
 def test_nones():
-    py.test.skip("Broken and noone wants to fix it")
+    py.test.skip("inprogress")
     a = [None] * 4
     def nones():        
         a.append(None)