TestConvenienceVariables - fixed a Linux problem

[vharron]

Summary

Test was waiting for wrong string on Linux.
It is still marked as XFAIL because of an intermittent failure.

[vharron]

Added comment

[sivachandra]

LGTM.
One nit which you can choose to ignore.

test/functionalities/embedded_interpreter/TestConvenienceVariables.py

84 ↗

(On Diff #22832)

Nit: I don't like the readability of this line. May be:

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:' + str(self.line) + ',' +
          '(name|queue) = \'.+\', stop reason = breakpoint 1\.1']

[clayborg]

Looks good.

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

def convenience_variables(self):
 
         child.sendline('print lldb.process')
         child.expect_exact(python_prompt)
         self.expect(child.before, exe=False,
             patterns = ['SBProcess: pid = \d+, state = stopped, threads = \d, executable = a.out'])
 
         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)
         self.expect(child.before, exe=False,
             patterns = ['frame #0: 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d' % self.line])
 
 
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
     unittest2.main()