From 95b533fe4b5a2603f11a6c967319d4ab0ef865ff Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 27 Jan 2016 19:47:28 +0000 Subject: [PATCH] Revert "Resubmit r258759 with proper unicode handling." This reverts commit 2c79d60214e146b13b233392a859b4f79340e90e. llvm-svn: 258978 --- .../Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py | 1 + lldb/packages/Python/lldbsuite/test/lldbtest.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py index fbb5551..9bb1faf 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py @@ -25,6 +25,7 @@ class Char1632TestCase(TestBase): line_number(self.source, '// breakpoint2') ] @expectedFailureIcc # ICC (13.1) does not emit the DW_TAG_base_type for char16_t and char32_t. + @expectedFailureWindows("llvm.org/pr24489: Name lookup not working correctly on Windows") def test(self): """Test that the C++11 support for char16_t and char32_t works correctly.""" self.build() diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index e5fdd6e..61355a8 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -262,7 +262,7 @@ class recording(SixStringIO): if self.trace: print(self.getvalue(), file=sys.stderr) if self.session: - print(self.getvalue().encode(), file=self.session) + print(self.getvalue(), file=self.session) self.close() @add_metaclass(abc.ABCMeta) @@ -1843,7 +1843,7 @@ class Base(unittest2.TestCase): if not self.__unexpected__ and not self.__skipped__: for test, traceback in pairs: if test is self: - print(traceback.encode(), file=self.session) + print(traceback, file=self.session) # put footer (timestamp/rerun instructions) into session testMethod = getattr(self, self._testMethodName) -- 2.7.4