[pypy-svn] r29271 - pypy/release/0.9.x/pypy/translator/cli/test

[hpk at codespeak.net]

Author: hpk
Date: Fri Jun 23 19:41:55 2006
New Revision: 29271

Modified:
   pypy/release/0.9.x/pypy/translator/cli/test/runtest.py
Log:
port rev-29270 of dist (Anto) 



Modified: pypy/release/0.9.x/pypy/translator/cli/test/runtest.py
==============================================================================
--- pypy/release/0.9.x/pypy/translator/cli/test/runtest.py	(original)
+++ pypy/release/0.9.x/pypy/translator/cli/test/runtest.py	Fri Jun 23 19:41:55 2006
@@ -167,6 +167,9 @@
         if self._exe is None:
             py.test.skip("Compilation disabled")
 
+        if getoption('norun'):
+            py.test.skip("Execution disabled")
+
         arglist = SDK.runtime() + [self._exe] + map(str, args)
         env = os.environ.copy()
         env['LANG'] = 'C'
@@ -176,7 +179,7 @@
         retval = mono.wait()
         assert retval == 0, stderr
 
-        res = eval(stdout)
+        res = eval(stdout.strip())
         if isinstance(res, tuple):
             res = StructTuple(res) # so tests can access tuple elements with .item0, .item1, etc.
         elif isinstance(res, list):