summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVince Harron <vince@nethacker.com>2015-04-15 10:36:39 +0000
committerVince Harron <vince@nethacker.com>2015-04-15 10:36:39 +0000
commite0d8dbe55f57a3ad33a7b55a9249b264168dbbec (patch)
tree3345394f4a4a2dd13d04d50d3b16e5d3dc1ffb14
parent7343ab44eec14f4531243196fa09acb3a8601c51 (diff)
downloadbcm5719-llvm-e0d8dbe55f57a3ad33a7b55a9249b264168dbbec.tar.gz
bcm5719-llvm-e0d8dbe55f57a3ad33a7b55a9249b264168dbbec.zip
TestConvenienceVariables - fixed a Linux problem
Test was waiting for wrong string on Linux. It is still marked as XFAIL because of an intermittent failure. Differential Revision: http://reviews.llvm.org/D8679 llvm-svn: 234993
-rw-r--r--lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
index afd676acb31..978f29394db 100644
--- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
+++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
@@ -79,8 +79,12 @@ class ConvenienceVariablesCase(TestBase):
child.sendline('print lldb.thread')
child.expect_exact(python_prompt)
+ # Linux outputs decimal tid and 'name' instead of 'queue'
self.expect(child.before, exe=False,
- patterns = ['thread #1: tid = 0x[0-9a-f]+, 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d, queue = \'.+\', stop reason = breakpoint 1\.1' % self.line])
+ patterns = ['thread #1: tid = (0x[0-9a-f]+|[0-9]+), 0x[0-9a-f]+ ' +
+ 'a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ ' +
+ 'at main\.c:%d, (name|queue) = \'.+\', stop reason =' +
+ ' breakpoint 1\.1' % self.line])
child.sendline('print lldb.frame')
child.expect_exact(python_prompt)
OpenPOWER on IntegriCloud