Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r67136:c2079f32123d
Date: 2013-09-29 10:52 -0700
http://bitbucket.org/pypy/pypy/changeset/c2079f32123d/
Log: Refs issue1606 -- unskipped this test by making it more flexible
diff --git a/pypy/module/pypyjit/test_pypy_c/test_thread.py
b/pypy/module/pypyjit/test_pypy_c/test_thread.py
--- a/pypy/module/pypyjit/test_pypy_c/test_thread.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_thread.py
@@ -1,4 +1,3 @@
-import py
from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
@@ -51,7 +50,6 @@
""")
def test_lock_acquire_release(self):
- py.test.skip("test too precise, please fix me")
def main(n):
import threading
lock = threading.Lock()
@@ -63,34 +61,34 @@
loop, = log.loops_by_filename(self.filepath)
assert loop.match("""
i58 = int_gt(i43, 0)
- guard_true(i58, descr=<Guard0x10483adb8>)
- p59 = getfield_gc(p15, descr=<FieldP
pypy.module.thread.os_lock.Lock.inst_lock 8>)
- i60 = getfield_gc(p59, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock 8>)
+ guard_true(i58, descr=...)
+ p59 = getfield_gc(p15, descr=<FieldP
pypy.module.thread.os_lock.Lock.inst_lock .*>)
+ i60 = getfield_gc(p59, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock .*>)
p61 = force_token()
- setfield_gc(p0, p61, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- i62 = call_release_gil(4312440032, i60, 1, descr=<Calli 4 ii EF=6>)
- guard_not_forced(descr=<Guard0x103f3cca0>)
- guard_no_exception(descr=<Guard0x10483ad40>)
+ setfield_gc(p0, p61, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ i62 = call_release_gil(..., i60, 1, descr=<Calli 4 ii EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
i63 = int_is_true(i62)
- guard_true(i63, descr=<Guard0x10483acc8>)
+ guard_true(i63, descr=...)
i64 = int_sub(i43, 1)
- guard_not_invalidated(descr=<Guard0x10483ac50>)
- p66 = getfield_gc(p15, descr=<FieldP
pypy.module.thread.os_lock.Lock.inst_lock 8>)
- i67 = getfield_gc(p66, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock 8>)
+ guard_not_invalidated(descr=...)
+ p66 = getfield_gc(p15, descr=<FieldP
pypy.module.thread.os_lock.Lock.inst_lock .*>)
+ i67 = getfield_gc(p66, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock .*>)
p68 = force_token()
- setfield_gc(p0, p68, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- i69 = call_release_gil(4312440032, i67, 0, descr=<Calli 4 ii EF=6>)
- guard_not_forced(descr=<Guard0x103f3cc20>)
- guard_no_exception(descr=<Guard0x10483aae8>)
+ setfield_gc(p0, p68, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ i69 = call_release_gil(..., i67, 0, descr=<Calli 4 ii EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
i70 = int_is_true(i69)
- guard_false(i70, descr=<Guard0x10483aa70>)
- i71 = getfield_gc(p66, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock 8>)
+ guard_false(i70, descr=...)
+ i71 = getfield_gc(p66, descr=<FieldU
rpython.rlib.rthread.Lock.inst__lock .*>)
p72 = force_token()
- setfield_gc(p0, p72, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- call_release_gil(4312441056, i71, descr=<Callv 0 i EF=6>)
- guard_not_forced(descr=<Guard0x103f3cba0>)
- guard_no_exception(descr=<Guard0x10483a9f8>)
- guard_not_invalidated(descr=<Guard0x10483a980>)
+ setfield_gc(p0, p72, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ call_release_gil(..., i71, descr=<Callv 0 i EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
+ guard_not_invalidated(descr=...)
--TICK--
- jump(..., descr=TargetToken(4361239720))
+ jump(..., descr=...)
""")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
