[pypy-svn] r75550 - pypy/branch/fast-forward/lib-python

[benjamin at codespeak.net]

Author: benjamin
Date: Thu Jun 24 04:55:31 2010
New Revision: 75550

Modified:
   pypy/branch/fast-forward/lib-python/conftest.py
Log:
ignore platform:ERROR things

Modified: pypy/branch/fast-forward/lib-python/conftest.py
==============================================================================
--- pypy/branch/fast-forward/lib-python/conftest.py	(original)
+++ pypy/branch/fast-forward/lib-python/conftest.py	Thu Jun 24 04:55:31 2010
@@ -7,6 +7,7 @@
 import py
 import sys
 import pypy
+import re
 from pypy.interpreter.gateway import ApplevelClass 
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.module import Module as PyPyModule 
@@ -747,7 +748,7 @@
                     outcome = 'ERROUT' 
                     test_stderr += ("-" * 80 + "\n") + out
             else:
-                if 'FAIL' in test_stdout or 'ERROR' in test_stderr:
+                if 'FAIL' in test_stdout or re.search('[^:]ERROR', test_stderr):
                     outcome = 'FAIL'
                     exit_status = 2  
         elif timedout: