diff --git a/lldb/packages/Python/lldbsuite/test_event/build_exception.py b/lldb/packages/Python/lldbsuite/test_event/build_exception.py
--- a/lldb/packages/Python/lldbsuite/test_event/build_exception.py
+++ b/lldb/packages/Python/lldbsuite/test_event/build_exception.py
@@ -4,13 +4,14 @@
         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(
+        self.stderr = called_process_error.lldb_extensions.get(
             "stderr_content", "<error output unavailable>")
+        self.stdout = called_process_error.lldb_extensions.get("stdout_content","<stdout output unavailable>")
 
     def __str__(self):
-        return self.format_build_error(self.command, self.build_error)
+        return self.format_build_error(self.command, self.stderr, self.stdout)
 
     @staticmethod
-    def format_build_error(command, command_output):
+    def format_build_error(command, stderr_output, stdout_output):
         return "Error when building test subject.\n\nBuild Command:\n{}\n\nBuild Command Output:\n{}".format(
-            command, command_output.decode("utf-8"))
+            command, stderr_output.decode("utf-8")+ stdout_output.decode("utf-8"))