[pypy-commit] pypy default: fix tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r44750:a32dd231d58c
Date: 2011-06-06 15:19 +0200
http://bitbucket.org/pypy/pypy/changeset/a32dd231d58c/

Log:	fix tests

diff --git a/pypy/jit/backend/llgraph/llimpl.py b/pypy/jit/backend/llgraph/llimpl.py
--- a/pypy/jit/backend/llgraph/llimpl.py
+++ b/pypy/jit/backend/llgraph/llimpl.py
@@ -601,14 +601,13 @@
         return _op_default_implementation
 
     def op_debug_merge_point(self, _, *args):
-        #from pypy.jit.metainterp.warmspot import get_stats
-        #loc = ConstPtr(value)._get_str()
-        #try:
-        #    stats = get_stats()
-        #except AttributeError:
-        #    pass
-        #else:
-        #    stats.add_merge_point_location(loc)
+        from pypy.jit.metainterp.warmspot import get_stats
+        try:
+            stats = get_stats()
+        except AttributeError:
+            pass
+        else:
+            stats.add_merge_point_location(args[1:])
         pass
 
     def op_guard_true(self, _, value):
diff --git a/pypy/jit/metainterp/test/test_logger.py b/pypy/jit/metainterp/test/test_logger.py
--- a/pypy/jit/metainterp/test/test_logger.py
+++ b/pypy/jit/metainterp/test/test_logger.py
@@ -51,9 +51,14 @@
     ts = llhelper
 
     def make_metainterp_sd(self):
+        class FakeJitDriver(object):
+            class warmstate(object):
+                get_location_str = staticmethod(lambda args: args[0]._get_str())
+        
         class FakeMetaInterpSd:
             cpu = AbstractCPU()
             cpu.ts = self.ts
+            jitdrivers_sd = [FakeJitDriver()]
             def get_name_from_address(self, addr):
                 return 'Name'
         return FakeMetaInterpSd()
@@ -111,11 +116,11 @@
     def test_debug_merge_point(self):
         inp = '''
         []
-        debug_merge_point("info", 0)
+        debug_merge_point(0, "dupa")
         '''
         _, loop, oloop = self.reparse(inp, check_equal=False)
-        assert loop.operations[0].getarg(0)._get_str() == 'info'
-        assert oloop.operations[0].getarg(0)._get_str() == 'info'
+        assert loop.operations[0].getarg(1)._get_str() == "dupa"
+        assert oloop.operations[0].getarg(0)._get_str() == "dupa"
         
     def test_floats(self):
         inp = '''
diff --git a/pypy/jit/metainterp/test/test_warmspot.py b/pypy/jit/metainterp/test/test_warmspot.py
--- a/pypy/jit/metainterp/test/test_warmspot.py
+++ b/pypy/jit/metainterp/test/test_warmspot.py
@@ -80,7 +80,7 @@
         self.meta_interp(f, [123, 10])
         assert len(get_stats().locations) >= 4
         for loc in get_stats().locations:
-            assert loc == 'GREEN IS 123.'
+            assert loc == (123,)
 
     def test_set_param_enable_opts(self):
         from pypy.rpython.annlowlevel import llstr, hlstr