vendor/lldb/lldb-trunk-r290819

1 files changed, 23 insertions, 17 deletions

diff --git a/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py b/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
index f9cdbca16e55..f17ba6f4a229 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -1,4 +1,4 @@
-#coding=utf8
+# coding=utf8
 """
 Test that C++ supports wchar_t correctly.
 """
@@ -6,12 +6,13 @@ Test that C++ supports wchar_t correctly.
 from __future__ import print_function
 
 
-
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.lldbtest import *
 import lldbsuite.test.lldbutil as lldbutil
 
+
 class CxxWCharTTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -21,7 +22,8 @@ class CxxWCharTTestCase(TestBase):
         TestBase.setUp(self)
         # Find the line number to break for main.cpp.
         self.source = 'main.cpp'
-        self.line = line_number(self.source, '// Set break point at this line.')
+        self.line = line_number(
+            self.source, '// Set break point at this line.')
 
     def test(self):
         """Test that C++ supports wchar_t correctly."""
@@ -33,42 +35,46 @@ class CxxWCharTTestCase(TestBase):
         self.assertTrue(target, VALID_TARGET)
 
         # Break on the struct declration statement in main.cpp.
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line)
+        lldbutil.run_break_set_by_file_and_line(self, "main.cpp", self.line)
 
         # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple (None, None, self.get_process_working_directory())
+        process = target.LaunchSimple(
+            None, None, self.get_process_working_directory())
 
         if not process:
             self.fail("SBTarget.Launch() failed")
 
         # Check that we correctly report templates on wchar_t
         self.expect("frame variable foo_y",
-            substrs = ['(Foo<wchar_t>) foo_y = '])
+                    substrs=['(Foo<wchar_t>) foo_y = '])
 
         # Check that we correctly report templates on int
         self.expect("frame variable foo_x",
-            substrs = ['(Foo<int>) foo_x = '])
+                    substrs=['(Foo<int>) foo_x = '])
 
         # Check that we correctly report wchar_t
         self.expect("frame variable foo_y.object",
-            substrs = ['(wchar_t) foo_y.object = '])
+                    substrs=['(wchar_t) foo_y.object = '])
 
         # Check that we correctly report int
         self.expect("frame variable foo_x.object",
-            substrs = ['(int) foo_x.object = '])
+                    substrs=['(int) foo_x.object = '])
 
         # Check that we can run expressions that return wchar_t
-        self.expect("expression L'a'",substrs = ['(wchar_t) $',"L'a'"])
+        self.expect("expression L'a'", substrs=['(wchar_t) $', "L'a'"])
 
         # Mazel Tov if this works!
         self.expect("frame variable mazeltov",
-            substrs = ['(const wchar_t *) mazeltov = ','L"מזל טוב"'])
+                    substrs=['(const wchar_t *) mazeltov = ', 'L"מזל טוב"'])
+
+        self.expect(
+            "frame variable ws_NULL",
+            substrs=['(wchar_t *) ws_NULL = 0x0'])
+        self.expect("frame variable ws_empty", substrs=[' L""'])
 
-        self.expect("frame variable ws_NULL",substrs = ['(wchar_t *) ws_NULL = 0x0'])
-        self.expect("frame variable ws_empty",substrs = [' L""'])
+        self.expect("frame variable array", substrs=[
+                    'L"Hey, I\'m a super wchar_t string'])
+        self.expect("frame variable array", substrs=['[0]'], matching=False)
 
-        self.expect("frame variable array",substrs = ['L"Hey, I\'m a super wchar_t string'])
-        self.expect("frame variable array",substrs = ['[0]'], matching=False)
-        
         self.expect('frame variable wchar_zero', substrs=["L'\\0'"])
         self.expect('expression wchar_zero', substrs=["L'\\0'"])