Author: Benson Li Date: 2020-07-22T16:38:20+02:00 New Revision: c9d5a3058fcde50c2fe40a5eaaa939d0995d3cd2
URL: https://github.com/llvm/llvm-project/commit/c9d5a3058fcde50c2fe40a5eaaa939d0995d3cd2 DIFF: https://github.com/llvm/llvm-project/commit/c9d5a3058fcde50c2fe40a5eaaa939d0995d3cd2.diff LOG: [lldb] add printing of stdout compile errors to lldbsuite Summary: Add printing of the output of stdout during compile errors, in addition to stderr output. Reviewed By: labath Differential Revision: https://reviews.llvm.org/D83425 Added: Modified: lldb/packages/Python/lldbsuite/test/lldbtest.py lldb/packages/Python/lldbsuite/test_event/build_exception.py lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index d73d5344d6c1..4aad2867cf8f 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -426,7 +426,7 @@ def system(commands, **kwargs): process = Popen( shellCommand, stdout=PIPE, - stderr=PIPE, + stderr=STDOUT, shell=True, **kwargs) pid = process.pid @@ -440,14 +440,12 @@ def system(commands, **kwargs): cpe = CalledProcessError(retcode, cmd) # Ensure caller can access the stdout/stderr. cpe.lldb_extensions = { - "stdout_content": this_output, - "stderr_content": this_error, + "combined_output": this_output, "command": shellCommand } raise cpe output = output + this_output.decode("utf-8") - error = error + this_error.decode("utf-8") - return (output, error) + return output def getsource_if_available(obj): @@ -1280,7 +1278,7 @@ def getCompilerVersion(self): version = 'unknown' compiler = self.getCompilerBinary() - version_output = system([[compiler, "-v"]])[1] + version_output = system([[compiler, "-v"]]) for line in version_output.split(os.linesep): m = re.search('version ([0-9\.]+)', line) if m: diff --git a/lldb/packages/Python/lldbsuite/test_event/build_exception.py b/lldb/packages/Python/lldbsuite/test_event/build_exception.py index 3347d9fd7cf7..993214edd871 100644 --- a/lldb/packages/Python/lldbsuite/test_event/build_exception.py +++ b/lldb/packages/Python/lldbsuite/test_event/build_exception.py @@ -4,8 +4,7 @@ def __init__(self, called_process_error): super(BuildError, self).__init__("Error when building test subject") self.command = called_process_error.lldb_extensions.get( "command", "<command unavailable>") - self.build_error = called_process_error.lldb_extensions.get( - "stderr_content", "<error output unavailable>") + self.build_error = called_process_error.lldb_extensions["combined_output"] def __str__(self): return self.format_build_error(self.command, self.build_error) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py index f5cf525427c8..aa5e20bd2f75 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -146,7 +146,7 @@ def cleanup(): if self.getCompiler().endswith('gcc') and not self.getCompiler().endswith('llvm-gcc'): import re gcc_version_output = system( - [[lldbutil.which(self.getCompiler()), "-v"]])[1] + [[lldbutil.which(self.getCompiler()), "-v"]]) self.trace("my output:", gcc_version_output) for line in gcc_version_output.split(os.linesep): m = re.search('\(Apple Inc\. build ([0-9]+)\)', line) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
