The 'regexp-break' command now prints out the command that results from

expanding the regular expression command.  So change the more stringent:

    self.expect(..., startstr = matching_string)

to:

    self.expect(..., substrs = [matched_string])

to pass the test.

llvm-svn: 116331
This commit is contained in:
Johnny Chen 2010-10-12 19:29:49 +00:00
parent 65c1c43c13
commit f062c2fb59
2 changed files with 4 additions and 4 deletions

View File

@ -71,7 +71,7 @@ class FoundationDisassembleTestCase(TestBase):
# Stop at +[NSString stringWithFormat:]. # Stop at +[NSString stringWithFormat:].
self.expect("regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED, self.expect("regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED,
startstr = "Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1") substrs = ["Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1"])
# Stop at -[MyString initWithNSString:]. # Stop at -[MyString initWithNSString:].
self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED, self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED,
@ -83,7 +83,7 @@ class FoundationDisassembleTestCase(TestBase):
# Stop at -[NSAutoreleasePool release]. # Stop at -[NSAutoreleasePool release].
self.expect("regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED, self.expect("regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED,
startstr = "Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1") substrs = ["Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1"])
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)

View File

@ -44,7 +44,7 @@ class FoundationTestCase(TestBase):
# Stop at +[NSString stringWithFormat:]. # Stop at +[NSString stringWithFormat:].
self.expect("regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED, self.expect("regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED,
startstr = "Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1") substrs = ["Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1"])
# Stop at -[MyString initWithNSString:]. # Stop at -[MyString initWithNSString:].
self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED, self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED,
@ -56,7 +56,7 @@ class FoundationTestCase(TestBase):
# Stop at -[NSAutoreleasePool release]. # Stop at -[NSAutoreleasePool release].
self.expect("regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED, self.expect("regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED,
startstr = "Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1") substrs = ["Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1"])
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)