diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-08-07 23:09:55 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-08-07 23:09:55 +0000 |
| commit | 6468a5ccab2ba4cf8c4d703b9726d31aee7b21fe (patch) | |
| tree | 059e9ff932075cedd40e53b3398563666c13d51d /llvm/utils | |
| parent | 7cf0b743aed7161d0846b6fbb0b2abf8a5ee40ab (diff) | |
| download | bcm5719-llvm-6468a5ccab2ba4cf8c4d703b9726d31aee7b21fe.tar.gz bcm5719-llvm-6468a5ccab2ba4cf8c4d703b9726d31aee7b21fe.zip | |
[lit] Make string encoding issues explicit.
llvm-svn: 187931
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/lit/lit/ProgressBar.py | 6 | ||||
| -rw-r--r-- | llvm/utils/lit/lit/TestFormats.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/llvm/utils/lit/lit/ProgressBar.py b/llvm/utils/lit/lit/ProgressBar.py index 0454ba29a43..2481bdfefa9 100644 --- a/llvm/utils/lit/lit/ProgressBar.py +++ b/llvm/utils/lit/lit/ProgressBar.py @@ -135,7 +135,11 @@ class TerminalController: # For any modern terminal, we should be able to just ignore # these, so strip them out. import curses - cap = curses.tigetstr(cap_name) or '' + cap = curses.tigetstr(cap_name) + if cap is None: + cap = '' + else: + cap = cap.decode('ascii') return re.sub(r'\$<\d+>[/*]?', '', cap) def render(self, template): diff --git a/llvm/utils/lit/lit/TestFormats.py b/llvm/utils/lit/lit/TestFormats.py index 9e0c7a0be7a..9c43a216b2c 100644 --- a/llvm/utils/lit/lit/TestFormats.py +++ b/llvm/utils/lit/lit/TestFormats.py @@ -30,6 +30,7 @@ class GoogleTest(object): try: lines = lit.Util.capture([path, '--gtest_list_tests'], env=localConfig.environment) + lines = lines.decode('ascii') if kIsWindows: lines = lines.replace('\r', '') lines = lines.split('\n') |
