[pypy-svn] r66066 - pypy/branch/pyjitpl5/pypy/translator/cli

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:39:20 2009
New Revision: 66066

Added:
   pypy/branch/pyjitpl5/pypy/translator/cli/rte.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/rte.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/cli/rte.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r63285 | afa | 2009-03-24 18:45:36 +0100 (Tue, 24 Mar 2009) | 2 lines
    
    On Windows, the cli compiler output messages to stdout. Add it to the exception.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/cli/rte.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/rte.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/cli/rte.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/cli/rte.py.merge.tmp	Tue Jun 30 16:39:20 2009
@@ -59,7 +59,8 @@
                                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = compiler.communicate()
         retval = compiler.wait()
-        assert retval == 0, 'Failed to compile %s: the compiler said:\n %s' % (cls.OUTPUT, stderr)
+        assert retval == 0, 'Failed to compile %s: the compiler said:\n %s' % (
+            cls.OUTPUT, stdout + stderr)
         if cls.ALIAS is not None:
             alias = cls._filename(cls.ALIAS)
             shutil.copy(out, alias)