[lldb-mi] Fix bugs in target-select-so-path.test

[apolyakov]

Summary

This patch fixes hanging of the test in case of using python3, changes callback function that will be called if the timer ends, changes python interpreter to %python that is set up by llvm-lit.
Also, the test didn't work properly since it didn't contain a call of filecheck_proc.communicate(), that means that filecheck didn't run and its return code was equal to 0 in all cases.

[apolyakov]

Removed the shebang line since we call the script via python ... so that line doesn't matter.

[tatyana-krasnukha]

Sorry, it was added in 3.2. Anyway, the test fails due to __init__() got an unexpected keyword argument 'pass_fds'.

[teemperor]

Hmmm, maybe I mixing up something here, but the docs state pass_fds was added in 3.2:

New in version 3.2: The pass_fds parameter was added.

[tatyana-krasnukha]

It seems I ran into an unrelated issue like this. If the revision works for others, you may ignore this.

[apolyakov]

Changed python version required to use 'pass_fds' argument to 3.2.
I tested this patch with python 2.7 and 3.5.

[tatyana-krasnukha]

Forget that the test calls default python, not which was passed to cmake. So, it is enough to replace (3,0) pair with (3,2) to fix.

lit/tools/lldb-mi/target/inputs/target-select-so-path.py

11

Here should be (3,2)

[tatyana-krasnukha]

Now works with Python 3.1 too. LGTM.

[apolyakov]

Changed the test to use %python variable instead of python

[teemperor]

Looks good and fixes the tests for me, so I think this is good to go. Thanks for the patch!

[labath]

LGTM. (BTW, python 3.1's EOL was 6 years ago)

lit/tools/lldb-mi/target/inputs/target-select-so-path.py

-#!/usr/bin/env python2
-
 import os
 import sys
 import subprocess
 from threading import Timer
 
 
 hostname = 'localhost'
 
 (r, w) = os.pipe()
+kwargs = {}
+if sys.version_info >= (3,2):
+    kwargs['pass_fds'] = [w]
+
 args = sys.argv
 # Get debugserver, lldb-mi and FileCheck executables' paths with arguments.
 debugserver = ' '.join([args[1], '--pipe', str(w), hostname + ':0'])
 lldbmi = args[2]
 test_file = args[3]
 filecheck = 'FileCheck ' + test_file
 
 # Run debugserver, lldb-mi and FileCheck.
-debugserver_proc = subprocess.Popen(debugserver.split())
+debugserver_proc = subprocess.Popen(debugserver.split(), **kwargs)
 lldbmi_proc = subprocess.Popen(lldbmi, stdin=subprocess.PIPE,
                                stdout=subprocess.PIPE, shell=True)
 filecheck_proc = subprocess.Popen(filecheck, stdin=subprocess.PIPE,
                                   shell=True)
 
 timeout_sec = 30
-timer = Timer(timeout_sec, lldbmi_proc.kill)
+timer = Timer(timeout_sec, exit, [filecheck_proc.returncode])
 try:
     timer.start()
 
     # Get a tcp port chosen by debugserver.
     # The number quite big to get lldb-server's output and to not hang.
     bytes_to_read = 10
     port_bytes = os.read(r, bytes_to_read)
     port = str(port_bytes.decode('utf-8').strip('\x00'))
 
     with open(test_file, 'r') as f:
         # Replace '$PORT' with a free port number and pass
         # test's content to lldb-mi.
-        lldbmi_proc.stdin.write(f.read().replace('$PORT', port))
+        lldbmi_proc.stdin.write(f.read().replace('$PORT', port).encode('utf-8'))
         out, err = lldbmi_proc.communicate()
         filecheck_proc.stdin.write(out)
+        filecheck_proc.communicate()
 finally:
     timer.cancel()
 
 debugserver_proc.kill()
 exit(filecheck_proc.returncode)

lit/tools/lldb-mi/target/target-select-so-path.test

 # UNSUPPORTED: windows, darwin
 #
 # RUN: %cc -o %t %p/inputs/main.c -g
-# RUN: python %p/inputs/target-select-so-path.py "%debugserver" "%lldbmi %t" %s
+# RUN: %python %p/inputs/target-select-so-path.py "%debugserver" "%lldbmi %t" %s
 
 # Test that -target-select command can hook up a path
 # added by gdb-set solib-search-path.
 
 # Check that we have a valid target created via file-exec-and-symbols.
 # CHECK: ^done
 
 -interpreter-exec console "target modules search-paths list"