summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite
diff options
context:
space:
mode:
authorEnrico Granata <egranata@apple.com>2016-01-26 04:53:10 +0000
committerEnrico Granata <egranata@apple.com>2016-01-26 04:53:10 +0000
commitdd54a3a8878a2d81ff840c6e3a1b866767c41dcc (patch)
treec486fa578069fb88c15649ba449ff31ddb7741e8 /lldb/packages/Python/lldbsuite
parentbee7575e1ae9b4ec2a6fe1e02dc5bf9db33a4437 (diff)
downloadbcm5719-llvm-dd54a3a8878a2d81ff840c6e3a1b866767c41dcc.tar.gz
bcm5719-llvm-dd54a3a8878a2d81ff840c6e3a1b866767c41dcc.zip
Reverting r258759 as it is breaking the OSX build
llvm-svn: 258791
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py1
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py2
2 files changed, 2 insertions, 1 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 fbb5551deee..9bb1faf4ba6 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 cea085c50a0..015615bd875 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1436,7 +1436,7 @@ class Base(unittest2.TestCase):
session_file = "{}.log".format(self.log_basename)
# Python 3 doesn't support unbuffered I/O in text mode. Open buffered.
- self.session = io.open(session_file, "w", encoding="utf-8")
+ self.session = open(session_file, "w")
# Optimistically set __errored__, __failed__, __expected__ to False
# initially. If the test errored/failed, the session info
OpenPOWER on IntegriCloud