[pypy-commit] pypy stmgc-c4: rstm.charp_inspect_abort_info() now turns the transaction inevitable. Must move the call

arigo noreply at buildbot.pypy.org
Sat Sep 7 19:27:10 CEST 2013


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r66842:f65b3995ba1a
Date: 2013-09-07 19:23 +0200
http://bitbucket.org/pypy/pypy/changeset/f65b3995ba1a/

Log:	rstm.charp_inspect_abort_info() now turns the transaction
	inevitable. Must move the call to it after abort_and_retry() in the
	test.

diff --git a/rpython/translator/stm/test/test_ztranslated.py b/rpython/translator/stm/test/test_ztranslated.py
--- a/rpython/translator/stm/test/test_ztranslated.py
+++ b/rpython/translator/stm/test/test_ztranslated.py
@@ -250,12 +250,12 @@
                 globf.xy = 100 + retry_counter
 
         def check(_, retry_counter):
-            last = rstm.charp_inspect_abort_info()
             rstm.abort_info_push(globf, ('[', 'xy', ']', 'yx'))
             setxy(globf, retry_counter)
             if retry_counter < 3:
                 rstm.abort_and_retry()
             #
+            last = rstm.charp_inspect_abort_info()
             print rffi.charp2str(last)
             print int(bool(rstm.charp_inspect_abort_info()))
             #


More information about the pypy-commit mailing list