[pypy-commit] pypy improve-vmprof-testing: Tweak the test until it tests what it is supposed to.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: improve-vmprof-testing
Changeset: r86067:39f3ff6ed5d7
Date: 2016-08-07 19:52 +0200
http://bitbucket.org/pypy/pypy/changeset/39f3ff6ed5d7/

Log:	Tweak the test until it tests what it is supposed to.

diff --git a/rpython/jit/backend/test/test_rvmprof.py b/rpython/jit/backend/test/test_rvmprof.py
--- a/rpython/jit/backend/test/test_rvmprof.py
+++ b/rpython/jit/backend/test/test_rvmprof.py
@@ -125,17 +125,20 @@
                              _hack_update_stack_untranslated=True)
         def f(codes, code, n, c):
             i = 0
-            while i < n:
+            while True:
                 driver.jit_merge_point(code=code, c=c, i=i, codes=codes, n=n)
+                if i >= n:
+                    break
+                i += 1
                 if code.name == "main":
                     try:
                         f(codes, codes[1], 1, c)
                     except MyExc as e:
                         c = e.c
+                    driver.can_enter_jit(code=code, c=c, i=i, codes=codes, n=n)
                 else:
                     llfn()
                     c -= 1
-                i += 1
             jit.promote(c + 5)     # failing guard
             raise MyExc(c)
 
diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -376,7 +376,6 @@
                 self.position = target
                 return
             if opcode == self.op_rvmprof_code:
-                import pdb;pdb.set_trace()
                 # do the 'jit_rvmprof_code(1)' for rvmprof, but then
                 # continue popping frames.  Decode jit_rvmprof_code
                 # manually here.