[Lldb-commits] [lldb] r184104 - Fix single whitespace before breakpoint filename in some tests due to r183932.
Matt Kopec
Matt.Kopec at intel.com
Mon Jun 17 12:00:32 PDT 2013
Author: mkopec
Date: Mon Jun 17 14:00:31 2013
New Revision: 184104
URL: http://llvm.org/viewvc/llvm-project?rev=184104&view=rev
Log:
Fix single whitespace before breakpoint filename in some tests due to r183932.
Modified:
lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
lldb/trunk/test/functionalities/alias/TestAliases.py
lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
lldb/trunk/test/functionalities/thread/TestNumThreads.py
lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
lldb/trunk/test/functionalities/thread/state/TestThreadStates.py
lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py
lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Mon Jun 17 14:00:31 2013
@@ -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.
#
Modified: lldb/trunk/test/functionalities/alias/TestAliases.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/alias/TestAliases.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/alias/TestAliases.py (original)
+++ lldb/trunk/test/functionalities/alias/TestAliases.py Mon Jun 17 14:00:31 2013
@@ -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'")
Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py Mon Jun 17 14:00:31 2013
@@ -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.
Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py Mon Jun 17 14:00:31 2013
@@ -41,7 +41,7 @@ class BreakpointLocationsTestCase(TestBa
# 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"])
Modified: lldb/trunk/test/functionalities/thread/TestNumThreads.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/TestNumThreads.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/TestNumThreads.py (original)
+++ lldb/trunk/test/functionalities/thread/TestNumThreads.py Mon Jun 17 14:00:31 2013
@@ -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)
Modified: lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py (original)
+++ lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py Mon Jun 17 14:00:31 2013
@@ -44,7 +44,7 @@ class BreakpointAfterJoinTestCase(TestBa
# 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)
Modified: lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py (original)
+++ lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py Mon Jun 17 14:00:31 2013
@@ -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)
Modified: lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py (original)
+++ lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py Mon Jun 17 14:00:31 2013
@@ -43,7 +43,7 @@ class ExitDuringBreakpointTestCase(TestB
# 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)
Modified: lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py (original)
+++ lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py Mon Jun 17 14:00:31 2013
@@ -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)
Modified: lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py (original)
+++ lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py Mon Jun 17 14:00:31 2013
@@ -43,7 +43,7 @@ class MultipleBreakpointTestCase(TestBas
# 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)
Modified: lldb/trunk/test/functionalities/thread/state/TestThreadStates.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/state/TestThreadStates.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/state/TestThreadStates.py (original)
+++ lldb/trunk/test/functionalities/thread/state/TestThreadStates.py Mon Jun 17 14:00:31 2013
@@ -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)
Modified: lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py (original)
+++ lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py Mon Jun 17 14:00:31 2013
@@ -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)
Modified: lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/array_types/TestArrayTypes.py?rev=184104&r1=184103&r2=184104&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/array_types/TestArrayTypes.py (original)
+++ lldb/trunk/test/lang/c/array_types/TestArrayTypes.py Mon Jun 17 14:00:31 2013
@@ -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"])
More information about the lldb-commits
mailing list