Author: apolyakov Date: Mon Sep 24 12:10:48 2018 New Revision: 342915 URL: http://llvm.org/viewvc/llvm-project?rev=342915&view=rev Log: [lldb-mi] Fix hanging of target-select-so-path.test
Summary: The target-select-so-path test might hang on some platforms. The reason of that behavior was in incorrect usage of Filecheck and lldb-mi processes. Instead of redirecting lldb-mi's output to Filecheck, we should run lldb-mi session, finish the session, collect its output and then pass it to Filecheck. Also, this patch adds a timer to the test to prevent it from hanging in the future. Reviewers: tatyana-krasnukha, aprantl, teemperor Reviewed By: tatyana-krasnukha, teemperor Subscribers: apolyakov, aprantl, teemperor, ki.stfu, abidh, lldb-commits Differential Revision: https://reviews.llvm.org/D52139 Modified: lldb/trunk/lit/tools/lldb-mi/target/inputs/target-select-so-path.py Modified: lldb/trunk/lit/tools/lldb-mi/target/inputs/target-select-so-path.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/tools/lldb-mi/target/inputs/target-select-so-path.py?rev=342915&r1=342914&r2=342915&view=diff ============================================================================== --- lldb/trunk/lit/tools/lldb-mi/target/inputs/target-select-so-path.py (original) +++ lldb/trunk/lit/tools/lldb-mi/target/inputs/target-select-so-path.py Mon Sep 24 12:10:48 2018 @@ -3,6 +3,7 @@ import os import sys import subprocess +from threading import Timer hostname = 'localhost' @@ -19,21 +20,28 @@ filecheck = 'FileCheck ' + test_file debugserver_proc = subprocess.Popen(debugserver.split()) lldbmi_proc = subprocess.Popen(lldbmi, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=True) -filecheck_proc = subprocess.Popen(filecheck, stdin=lldbmi_proc.stdout, +filecheck_proc = subprocess.Popen(filecheck, stdin=subprocess.PIPE, shell=True) -# 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.wait() - filecheck_proc.wait() +timeout_sec = 30 +timer = Timer(timeout_sec, lldbmi_proc.kill) +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)) + out, err = lldbmi_proc.communicate() + filecheck_proc.stdin.write(out) +finally: + timer.cancel() debugserver_proc.kill() exit(filecheck_proc.returncode) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
