diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index d828d1bc80d5..4df8cbc006aa 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -122,10 +122,10 @@ class AbbreviationsTestCase(TestBase): self.expect("break list", substrs = ["1: name = 'product', locations = 1", "2: name = 'sum', locations = 1", - "3: file ='main.cpp', line = 32, locations = 1"]) + "3: file = 'main.cpp', line = 32, locations = 1"]) self.expect("br cl -l 32 -f main.cpp", startstr = "1 breakpoints cleared:", - substrs = ["3: file ='main.cpp', line = 32, locations = 1"]) + substrs = ["3: file = 'main.cpp', line = 32, locations = 1"]) # Add a future to terminate the current process being debugged. # diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py index 644860290cf5..99fb1d19fe0b 100644 --- a/lldb/test/functionalities/alias/TestAliases.py +++ b/lldb/test/functionalities/alias/TestAliases.py @@ -96,7 +96,7 @@ class AliasTestCase(TestBase): startstr = "Current breakpoints:", substrs = [ "1: name = 'foo', locations = 1", "2: name = 'sum', locations = 1", - "3: file ='main.cpp', line = 32, locations = 1" ]) + "3: file = 'main.cpp', line = 32, locations = 1" ]) self.runCmd ("bpa -s python 1 -o 'print frame; print bp_loc'") self.runCmd ("bpa -s command 2 -o 'frame variable b'") diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index e6fe72e73507..e5dc11551e0e 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -62,12 +62,12 @@ class BreakpointCommandTestCase(TestBase): # The breakpoint list now only contains breakpoint 1. self.expect("breakpoint list", "Breakpoints 1 & 2 created", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.line, - "2: file ='main.c', line = %d, locations = 1" % self.line] ) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.line, + "2: file = 'main.c', line = %d, locations = 1" % self.line] ) self.expect("breakpoint list -f", "Breakpoints 1 & 2 created", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.line, - "2: file ='main.c', line = %d, locations = 1" % self.line], + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.line, + "2: file = 'main.c', line = %d, locations = 1" % self.line], patterns = ["1.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line, "2.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line]) @@ -143,13 +143,13 @@ class BreakpointCommandTestCase(TestBase): # The breakpoint list now only contains breakpoint 1. self.expect("breakpoint list -f", "Breakpoint 1 exists", - substrs = ["1: file ='main.c', line = %d, locations = 1, resolved = 1" % + substrs = ["1: file = 'main.c', line = %d, locations = 1, resolved = 1" % self.line, "hit count = 1"]) # Not breakpoint 2. self.expect("breakpoint list -f", "No more breakpoint 2", matching=False, - substrs = ["2: file ='main.c', line = %d, locations = 1, resolved = 1" % + substrs = ["2: file = 'main.c', line = %d, locations = 1, resolved = 1" % self.line]) # Run the program again, with breakpoint 1 remaining. diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py index 251cc424c75f..e6896c3894c3 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py @@ -41,7 +41,7 @@ class BreakpointLocationsTestCase(TestBase): # The breakpoint list should show 3 locations. self.expect("breakpoint list -f", "Breakpoint locations shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 3" % self.line], + substrs = ["1: file = 'main.c', line = %d, locations = 3" % self.line], patterns = ["where = a.out`func_inlined .+unresolved, hit count = 0", "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"]) diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py index 9c75991cddfa..444853510d77 100644 --- a/lldb/test/functionalities/thread/TestNumThreads.py +++ b/lldb/test/functionalities/thread/TestNumThreads.py @@ -41,7 +41,7 @@ class NumberOfThreadsTestCase(TestBase): # The breakpoint list should show 3 locations. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.line]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.line]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py index 2c7f7b1b2790..061ad304bf7b 100644 --- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -44,7 +44,7 @@ class BreakpointAfterJoinTestCase(TestBase): # The breakpoint list should show 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.breakpoint]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.breakpoint]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py index 23a777c12570..d7600f4b5cbd 100644 --- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -86,7 +86,7 @@ class CreateDuringStepTestCase(TestBase): # The breakpoint list should show 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.breakpoint]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.breakpoint]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py index 7c0a29bad53d..75bef14d2569 100644 --- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -43,7 +43,7 @@ class ExitDuringBreakpointTestCase(TestBase): # The breakpoint list should show 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.breakpoint]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.breakpoint]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index 8e6a6a69d4ce..6b2cbab2c99f 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -86,7 +86,7 @@ class ExitDuringStepTestCase(TestBase): # The breakpoint list should show 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.breakpoint]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.breakpoint]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py index a042284d40b7..f92c09b8125a 100644 --- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -43,7 +43,7 @@ class MultipleBreakpointTestCase(TestBase): # The breakpoint list should show 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.breakpoint]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.breakpoint]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py index fe9fb2044083..8b5ea25030c7 100644 --- a/lldb/test/functionalities/thread/state/TestThreadStates.py +++ b/lldb/test/functionalities/thread/state/TestThreadStates.py @@ -98,7 +98,7 @@ class ThreadStateTestCase(TestBase): # The breakpoint list should show 1 breakpoint with 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.break_1]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.break_1]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) @@ -139,7 +139,7 @@ class ThreadStateTestCase(TestBase): # The breakpoint list should show 1 breakpoints with 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.break_1]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.break_1]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) @@ -188,7 +188,7 @@ class ThreadStateTestCase(TestBase): # The breakpoint list should show 1 breakpoints with 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.break_1]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.break_1]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) @@ -232,7 +232,7 @@ class ThreadStateTestCase(TestBase): # The breakpoint list should show 1 breakpoints with 1 location. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.break_1]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.break_1]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) @@ -286,8 +286,8 @@ class ThreadStateTestCase(TestBase): # The breakpoint list should show 2 breakpoints with 1 location each. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.c', line = %d, locations = 1" % self.break_1, - "2: file ='main.c', line = %d, locations = 1" % self.break_2]) + substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.break_1, + "2: file = 'main.c', line = %d, locations = 1" % self.break_2]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py index 7fd4f91db0b4..bb8e2842f676 100644 --- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py +++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py @@ -49,10 +49,10 @@ class ThreadExitTestCase(TestBase): # The breakpoint list should show 1 locations. self.expect("breakpoint list -f", "Breakpoint location shown correctly", - substrs = ["1: file ='main.cpp', line = %d, locations = 1" % self.break_1, - "2: file ='main.cpp', line = %d, locations = 1" % self.break_2, - "3: file ='main.cpp', line = %d, locations = 1" % self.break_3, - "4: file ='main.cpp', line = %d, locations = 1" % self.break_4]) + substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.break_1, + "2: file = 'main.cpp', line = %d, locations = 1" % self.break_2, + "3: file = 'main.cpp', line = %d, locations = 1" % self.break_3, + "4: file = 'main.cpp', line = %d, locations = 1" % self.break_4]) # Run the program. self.runCmd("run", RUN_SUCCEEDED) diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py index ed5017ad53e8..ea638db0ad1e 100644 --- a/lldb/test/lang/c/array_types/TestArrayTypes.py +++ b/lldb/test/lang/c/array_types/TestArrayTypes.py @@ -105,7 +105,7 @@ class ArrayTypesTestCase(TestBase): # Sanity check the print representation of breakpoint. bp = str(breakpoint) self.expect(bp, msg="Breakpoint looks good", exe=False, - substrs = ["file ='main.c'", + substrs = ["file = 'main.c'", "line = %d" % self.line, "locations = 1"]) self.expect(bp, msg="Breakpoint is not resolved as yet", exe=False, matching=False, @@ -139,7 +139,7 @@ class ArrayTypesTestCase(TestBase): # The breakpoint should be resolved by now. bp = str(breakpoint) self.expect(bp, "Breakpoint looks good and is resolved", exe=False, - substrs = ["file ='main.c'", + substrs = ["file = 'main.c'", "line = %d" % self.line, "locations = 1"])