aboutsummaryrefslogtreecommitdiffstats
path: root/utils/lit/lit/util.py
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-01-09 01:56:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-09 01:56:34 +0000
commitce4c5fc5adebc9960edec1d2161e23d06b2d8107 (patch)
tree0468955590ca5bb36f3bce14ff55076cbe621cae /utils/lit/lit/util.py
parent4a6ac12444cc5c7b0a8fe1c2909fb78002cea488 (diff)
parent51e2fa825ba84f67cebe4c3d1c93bd2f94fb1318 (diff)
downloadexternal_llvm-ce4c5fc5adebc9960edec1d2161e23d06b2d8107.zip
external_llvm-ce4c5fc5adebc9960edec1d2161e23d06b2d8107.tar.gz
external_llvm-ce4c5fc5adebc9960edec1d2161e23d06b2d8107.tar.bz2
am 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`"
* commit '51e2fa825ba84f67cebe4c3d1c93bd2f94fb1318': [LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`
Diffstat (limited to 'utils/lit/lit/util.py')
-rw-r--r--utils/lit/lit/util.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/utils/lit/lit/util.py b/utils/lit/lit/util.py
index cce620c..ca1aeb6 100644
--- a/utils/lit/lit/util.py
+++ b/utils/lit/lit/util.py
@@ -7,6 +7,15 @@ import signal
import subprocess
import sys
+def to_bytes(str):
+ # Encode to UTF-8 to get binary data.
+ return str.encode('utf-8')
+
+def to_string(bytes):
+ if isinstance(bytes, str):
+ return bytes
+ return to_bytes(bytes)
+
def detectCPUs():
"""
Detects the number of CPUs on a system. Cribbed from pp.
@@ -156,11 +165,6 @@ def executeCommand(command, cwd=None, env=None):
if exitCode == -signal.SIGINT:
raise KeyboardInterrupt
- def to_string(bytes):
- if isinstance(bytes, str):
- return bytes
- return bytes.encode('utf-8')
-
# Ensure the resulting output is always of string type.
try:
out = to_string(out.decode('utf-8'))