[pypy-svn] r64865 - in pypy/branch/pyjitpl5/pypy/jit: backend/test metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Thu Apr 30 16:44:42 2009
New Revision: 64865

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/test/support.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py
Log:
Some more test fixes.


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/test/support.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/test/support.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/test/support.py	Thu Apr 30 16:44:42 2009
@@ -91,11 +91,8 @@
         exe_name = cbuilder.compile()
         log('---------- Test starting ----------')
         stdout = cbuilder.cmdexec(" ".join([str(arg) for arg in args]))
-        if stdout == 'None\n':
-            res = None
-        else:
-            res = int(stdout)
-        log('---------- Test done (%s) ----------' % (res,))
+        res = int(stdout)
+        log('---------- Test done (%d) ----------' % (res,))
         return res
 
 class CliCompiledMixin(BaseCompiledMixin):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_loop.py	Thu Apr 30 16:44:42 2009
@@ -94,6 +94,7 @@
                 else:
                     pass
                 pattern >>= 1
+            return 42
         self.meta_interp(f, [0xF0F0])
         self.check_loop_count(2)
 
@@ -547,6 +548,7 @@
                         k = 15
                         z = 0
                 n -= 1
+            return 42
 
         res = self.meta_interp(f, [200])