[pypy-commit] pypy remove-globals-in-jit: More tests to skip when running untranslated in a real backend...

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: remove-globals-in-jit
Changeset: r59224:a2e6e969bafd
Date: 2012-12-02 11:05 -0800
http://bitbucket.org/pypy/pypy/changeset/a2e6e969bafd/

Log:    More tests to skip when running untranslated in a real backend...

diff --git a/pypy/jit/metainterp/test/test_virtualizable.py 
b/pypy/jit/metainterp/test/test_virtualizable.py
--- a/pypy/jit/metainterp/test/test_virtualizable.py
+++ b/pypy/jit/metainterp/test/test_virtualizable.py
@@ -660,7 +660,13 @@
         self.check_aborted_count(3)
         self.check_jitcell_token_count(0)
 
+    def _skip_if_untranslated_on_a_real_backend(self):
+        if not hasattr(self.CPUClass, 'is_llgraph'):
+            py.test.skip("xxx only works on the llgraph backend, or "
+                         "fully translated")
+
     def test_external_read_sometimes(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -697,6 +703,7 @@
         assert res == f(123)
 
     def test_external_read_sometimes_with_virtuals(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -740,6 +747,7 @@
         assert res == f(123)
 
     def test_external_read_sometimes_changing_virtuals(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -788,6 +796,7 @@
         assert res == f(123)
 
     def test_external_read_sometimes_with_exception(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -830,6 +839,7 @@
         assert res == f(123)
 
     def test_external_read_sometimes_dont_compile_guard(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
@@ -866,6 +876,7 @@
         assert res == f(123)
 
     def test_external_read_sometimes_recursive(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['rec', 'frame'],
                               virtualizables = ['frame'])
         
@@ -917,6 +928,7 @@
         assert res == main(123)
 
     def test_external_write_sometimes(self):
+        self._skip_if_untranslated_on_a_real_backend()
         jitdriver = JitDriver(greens = [], reds = ['frame'],
                               virtualizables = ['frame'])
         
diff --git a/pypy/jit/metainterp/test/test_virtualref.py 
b/pypy/jit/metainterp/test/test_virtualref.py
--- a/pypy/jit/metainterp/test/test_virtualref.py
+++ b/pypy/jit/metainterp/test/test_virtualref.py
@@ -285,7 +285,13 @@
                           new_array=6)         # next1/2/3
         self.check_aborted_count(0)
 
+    def _skip_if_untranslated_on_a_real_backend(self):
+        if not hasattr(self.CPUClass, 'is_llgraph'):
+            py.test.skip("xxx only works on the llgraph backend, or "
+                         "fully translated")
+
     def test_simple_force_sometimes(self):
+        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n'])
         #
         A = lltype.GcArray(lltype.Signed)
@@ -511,6 +517,7 @@
         self.check_aborted_count(0)
 
     def test_alloc_virtualref_and_then_alloc_structure(self):
+        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n'])
         #
         class XY:
@@ -569,6 +576,7 @@
         py.test.raises(UnknownException, "self.meta_interp(fn, [10])")
 
     def test_call_virtualref_already_forced(self):
+        self._skip_if_untranslated_on_a_real_backend()
         myjitdriver = JitDriver(greens = [], reds = ['n', 'res'])
         #
         class XY:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit