[Lldb-commits] [lldb] r234993 - TestConvenienceVariables - fixed a Linux problem

[Vince Harron]

Author: vharron
Date: Wed Apr 15 05:36:39 2015
New Revision: 234993

URL: http://llvm.org/viewvc/llvm-project?rev=234993&view=rev
Log:
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


Modified:
    lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py

Modified: lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py?rev=234993&r1=234992&r2=234993&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py (original)
+++ lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py Wed Apr 15 05:36:39 2015
@@ -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)