[pypy-commit] pypy default: Skip the @inline tests and disable it. Keep it around for later, maybe.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r60596:102a9b7e5720
Date: 2013-01-28 10:41 +0100
http://bitbucket.org/pypy/pypy/changeset/102a9b7e5720/

Log:	Skip the @inline tests and disable it. Keep it around for later,
	maybe.

diff --git a/rpython/jit/metainterp/test/test_warmspot.py b/rpython/jit/metainterp/test/test_warmspot.py
--- a/rpython/jit/metainterp/test/test_warmspot.py
+++ b/rpython/jit/metainterp/test/test_warmspot.py
@@ -401,6 +401,7 @@
         assert len(oplabel.getarglist()) == 2     # 'n', 'res' in some order
 
     def test_inline_jit_merge_point(self):
+        py.test.skip("fix the test if you want to re-enable this")
         # test that the machinery to inline jit_merge_points in callers
         # works. The final user does not need to mess manually with the
         # _inline_jit_merge_point_ attribute and similar, it is all nicely
@@ -430,6 +431,7 @@
         self.check_resops(int_add=4)
 
     def test_jitdriver_inline(self):
+        py.test.skip("fix the test if you want to re-enable this")
         myjitdriver = JitDriver(greens = [], reds = 'auto')
         class MyRange(object):
             def __init__(self, n):
@@ -462,6 +464,7 @@
         self.check_trace_count(1)
 
     def test_jitdriver_inline_twice(self):
+        py.test.skip("fix the test if you want to re-enable this")
         myjitdriver = JitDriver(greens = [], reds = 'auto')
 
         def jit_merge_point(a, b):
@@ -492,6 +495,7 @@
         self.check_trace_count(2)
 
     def test_jitdriver_inline_exception(self):
+        py.test.skip("fix the test if you want to re-enable this")
         # this simulates what happens in a real case scenario: inside the next
         # we have a call which we cannot inline (e.g. space.next in the case
         # of W_InterpIterable), but we need to put it in a try/except block.
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -578,6 +578,8 @@
         pass
 
     def inline(self, call_jit_merge_point):
+        assert False, "@inline off: see skipped failures in test_warmspot."
+        #
         assert self.autoreds, "@inline works only with reds='auto'"
         self.inline_jit_merge_point = True
         def decorate(func):