[llvm] r188359 - [lit] Avoid StringIO.
Daniel Dunbar
daniel at zuster.org
Tue Aug 13 22:07:13 PDT 2013
Author: ddunbar
Date: Wed Aug 14 00:07:13 2013
New Revision: 188359
URL: http://llvm.org/viewvc/llvm-project?rev=188359&view=rev
Log:
[lit] Avoid StringIO.
- We barely used it, and it is very hard to use in a 2.5-3 compatible
way because of changing expectations for its input types.
Modified:
llvm/trunk/utils/lit/lit/TestRunner.py
Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=188359&r1=188358&r2=188359&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Wed Aug 14 00:07:13 2013
@@ -3,10 +3,6 @@ import os, signal, subprocess, sys
import re
import platform
import tempfile
-try:
- from io import StringIO
-except ImportError:
- from StringIO import StringIO
import lit.ShUtil as ShUtil
import lit.Test as Test
@@ -445,23 +441,33 @@ def parseIntegratedTestScript(test, norm
return script,isXFail,tmpBase,execdir
def formatTestOutput(status, out, err, exitCode, script):
- output = StringIO()
- output.write(u"Script:\n")
- output.write(u"--\n")
- output.write(u'\n'.join(script))
- output.write(u"\n--\n")
- output.write(u"Exit Code: %r\n\n" % exitCode)
+ output = """\
+Script:
+--
+%s
+--
+Exit Code: %d
+
+""" % ('\n'.join(script), exitCode)
+
+ # Append the stdout, if present.
if out:
- output.write(u"Command Output (stdout):\n")
- output.write(u"--\n")
- output.write(unicode(out))
- output.write(u"--\n")
+ output += """\
+Command Output (stdout):
+--
+%s
+--
+""" % (out,)
+
+ # Append the stderr, if present.
if err:
- output.write(u"Command Output (stderr):\n")
- output.write(u"--\n")
- output.write(unicode(err))
- output.write(u"--\n")
- return (status, output.getvalue())
+ output += """\
+Command Output (stderr):
+--
+%s
+--
+""" % (err,)
+ return (status, output)
def executeShTest(test, litConfig, useExternalSh,
extra_substitutions=[]):
More information about the llvm-commits
mailing list