[pypy-svn] r72539 - pypy/trunk/pypy/translator/backendopt/test

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar 22 12:51:14 2010
New Revision: 72539

Modified:
   pypy/trunk/pypy/translator/backendopt/test/test_merge_if_blocks.py
Log:
Fix test for 64-bit.


Modified: pypy/trunk/pypy/translator/backendopt/test/test_merge_if_blocks.py
==============================================================================
--- pypy/trunk/pypy/translator/backendopt/test/test_merge_if_blocks.py	(original)
+++ pypy/trunk/pypy/translator/backendopt/test/test_merge_if_blocks.py	Mon Mar 22 12:51:14 2010
@@ -5,7 +5,7 @@
 from pypy.objspace.flow.model import flatten, Block
 from pypy.translator.backendopt.removenoops import remove_same_as
 from pypy.rpython.llinterp import LLInterpreter
-from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong
+from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, r_int
 from pypy.annotation.model import SomeChar, SomeUnicodeCodePoint
 
 def do_test_merge(fn, testvalues):
@@ -38,7 +38,8 @@
         return 4
     do_test_merge(merge_int, range(4))
     do_test_merge(merge_int, [r_uint(i) for i in range(4)])
-    do_test_merge(merge_int, [r_longlong(i) for i in range(4)])
+    if r_longlong is not r_int:
+        do_test_merge(merge_int, [r_longlong(i) for i in range(4)])
     do_test_merge(merge_int, [r_ulonglong(i) for i in range(4)])
 
     def merge_chr(n):