[pypy-commit] pypy py3.5: hg merge default

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r92956:ed4ba7032f9d
Date: 2017-11-06 16:53 +0000
http://bitbucket.org/pypy/pypy/changeset/ed4ba7032f9d/

Log:	hg merge default

diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py
--- a/lib_pypy/_tkinter/app.py
+++ b/lib_pypy/_tkinter/app.py
@@ -185,6 +185,9 @@
             if err == tklib.TCL_ERROR:
                 self.raiseTclError()
 
+    def interpaddr(self):
+        return int(tkffi.cast('size_t', self.interp))
+
     def _var_invoke(self, func, *args, **kwargs):
         if self.threaded and self.thread_id != tklib.Tcl_GetCurrentThread():
             # The current thread is not the interpreter thread.
diff --git a/rpython/jit/metainterp/test/test_del.py b/rpython/jit/metainterp/test/test_del.py
--- a/rpython/jit/metainterp/test/test_del.py
+++ b/rpython/jit/metainterp/test/test_del.py
@@ -82,46 +82,5 @@
         assert res == 1
         self.check_resops(call_r=1)   # for the case B(), but not for the case A()
 
-    def test_keepalive(self):
-        py.test.skip("XXX fails")   # hum, I think the test itself is broken
-        #
-        mydriver = JitDriver(reds = ['n', 'states'], greens = [])
-        class State:
-            num = 1
-        class X:
-            def __init__(self, state):
-                self.state = state
-            def __del__(self):
-                self.state.num += 1
-        @dont_look_inside
-        def do_stuff():
-            pass
-        def f(n):
-            states = []
-            while n > 0:
-                mydriver.jit_merge_point(n=n, states=states)
-                state = State()
-                states.append(state)
-                x = X(state)
-                do_stuff()
-                state.num *= 1000
-                do_stuff()
-                keepalive_until_here(x)
-                n -= 1
-            return states
-        def main(n):
-            states = f(n)
-            rgc.collect()
-            rgc.collect()
-            err = 1001
-            for state in states:
-                if state.num != 1001:
-                    err = state.num
-                    print 'ERROR:', err
-            return err
-        assert main(20) == 1001
-        res = self.meta_interp(main, [20])
-        assert res == 1001
-
 class TestLLtype(DelTests, LLJitMixin):
     pass
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
new file mode 100644
--- /dev/null
+++ b/testrunner/get_info.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+"""
+Dump some translation information to stdout as JSON. Used by buildbot.
+"""
+
+import sys
+import os
+import json
+
+BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+TARGET_BASENAME = 'pypy-c'
+
+def make_info_dict():
+    target = TARGET_BASENAME
+    if sys.platform.startswith('win'):
+        target += '.exe'
+    target_path = os.path.join(BASE_DIR, 'pypy', 'goal', target)
+    return {'target_path': target_path}
+
+def dump_info():
+    return json.dumps(make_info_dict())
+
+if __name__ == '__main__':
+    print dump_info()