DbgFw: save tool output to file in simics.

Change-Id: Ib796caecac77df68012c79fce481445ba171d7ed
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/507
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 15 insertions, 7 deletions

diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py
index 458b2fc35..9cbfe8090 100755
--- a/src/build/debug/simics-debug-framework.py
+++ b/src/build/debug/simics-debug-framework.py
@@ -89,9 +89,10 @@ class DebugFrameworkProcess:
     usage = None;               # mode - Usage output instead of Execution.
     imgPath = "./";             # Image dir path override.
     result = "";                # Result string for Usage-mode.
+    outputFile = None;          # Output file for results in addition to STDOUT
 
     def __init__(self, tool = "Printk", toolOptions = "",
-                       usage = None, imgPath = "./"):
+                       usage = None, imgPath = "./",outputFile = None):
         # Determine sub-process arguments.
         process_args = ["./simics-debug-framework.pl"];
         if (usage): # Pass --usage if Usage mode selected.
@@ -105,6 +106,7 @@ class DebugFrameworkProcess:
         self.toolOptions = toolOptions;
         self.usage = usage;
         self.imgPath = imgPath;
+        self.outputFile = open(outputFile, 'w') if outputFile else None;
 
     # Read a message from the process pipe.
     def recvMsg(self):
@@ -131,6 +133,8 @@ class DebugFrameworkProcess:
             self.result += data
         else:
             print data,
+            if self.outputFile:
+                print >>self.outputFile,data,
 
     # Read data from memory.
     #    This message has data of the format "0xADDRESS,0xSIZE".
@@ -164,9 +168,9 @@ class DebugFrameworkProcess:
 # @param usage - Usage mode or Execute mode.
 # @param imgPath - Image path override.
 def run_hb_debug_framework(tool = "Printk", toolOpts = "",
-                           usage = None, imgPath = "./"):
+                           usage = None, imgPath = "./", outputFile = None):
     # Create debug sub-process.
-    fp = DebugFrameworkProcess(tool,toolOpts,usage,imgPath)
+    fp = DebugFrameworkProcess(tool,toolOpts,usage,imgPath,outputFile)
 
     # Read / handle messages until there are no more.
     msg = fp.recvMsg()
@@ -212,7 +216,9 @@ def register_hb_debug_framework_tools():
         new_command("hb-" + tool,
                     (lambda toolname:
                         lambda options:
-                            run_hb_debug_framework(toolname, options))(tool),
+                            run_hb_debug_framework(toolname, options,
+                                outputFile="hb-debug-"+toolname+".output"))
+                    (tool),
                     args = [arg(str_t, "options", "?", "")],
                     alias = "hb-debug-" + tool,
                     type = ["hostboot-commands"],
diff --git a/src/build/simics/hb-simdebug.py b/src/build/simics/hb-simdebug.py
index 64bedad29..0119eb531 100755
--- a/src/build/simics/hb-simdebug.py
+++ b/src/build/simics/hb-simdebug.py
@@ -250,7 +250,8 @@ default_stringFile = "hbotStringFile"
 #------------------------------------------------
 new_command("hb-trace",
     (lambda comp: run_hb_debug_framework("Trace",
-                                         ("components="+comp) if comp else "")),
+                                         ("components="+comp) if comp else "",
+                                         outputFile = "hb-trace.output")),
     [arg(str_t, "comp", "?", None),
     ],
     #alias = "hbt",
@@ -276,7 +277,7 @@ Examples: \n
 #------------------------------------------------
 #------------------------------------------------
 new_command("hb-printk",
-    lambda: run_hb_debug_framework("Printk"),
+    lambda: run_hb_debug_framework("Printk", outputFile = "hb-printk.output"),
     #alias = "hbt",
     type = ["hostboot-commands"],
     #see_also = ["hb-trace"],
@@ -380,7 +381,8 @@ new_command("hb-errl",
     (lambda logid, logidStr, flg_l, flg_d:
         run_hb_debug_framework("Errl",
                 ("display="+(str(logid) if logid else logidStr) if flg_d else ""
-                ))),
+                ),
+                outputFile = "hb-errl.output")),
     [ arg(int_t, "logid", "?", None),
      arg(str_t, "logidStr", "?", None),
      arg(flag_t, "-l"),