[XTF PATCH 2/3] xtf-runner: options for different modes to get output

[Wei Liu <wei.liu2@citrix.com>]

Only options and help text. Implementation will come later.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xtf-runner | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/xtf-runner b/xtf-runner
index 7b69c45..73a4e0d 100755
--- a/xtf-runner
+++ b/xtf-runner
@@ -532,6 +532,20 @@ def main():
                   "  all tests in the selection, printing a summary of their\n"
                   "  results at the end.\n"
                   "\n"
+                  "  To determine how runner should get output from Xen, use\n"
+                  "  --mode option. The default value is \"auto\", which\n"
+                  "  will choose the mode based on Xen version. Other\n"
+                  "  supported values are \"console\" and \"logfile\", which\n"
+                  "  respectively means to get log from xenconsole and\n"
+                  "  to get log from xencosonsoled output.\n"
+                  "\n"
+                  "  The \"logfile\" mode requires users to configure\n"
+                  "  xenconsoled to log guest console output. This mode\n"
+                  "  is useful for Xen version < 4.8. Note that runner will\n"
+                  "  append a custom string to guest log file before\n"
+                  "  running each test. Also see --logfile-dir\n"
+                  "  and --logfile-pattern options.\n"
+                  "\n"
                   "Selections:\n"
                   "  A selection is zero or more of any of the following\n"
                   "  parameters: Categories, Environments and Tests.\n"
@@ -609,6 +623,19 @@ def main():
                       dest = "host", help = "Restrict selection to applicable"
                       " tests for the current host",
                       )
+    parser.add_option("-m", "--mode", action = "store",
+                      dest = "mode", default = "auto", type = "string",
+                      help = "Instruct how runner gets its output (see below)")
+    parser.add_option("--logfile-dir", action = "store",
+                      dest = "logfile_dir", default = "/var/log/xen/console/",
+                      type = "string",
+                      help = 'Specify the directory to look for console logs, \
+defaults to "/var/log/xen/console/"')
+    parser.add_option("--logfile-pattern", action = "store",
+                      dest = "logfile_pattern", default = "guest-%s.log",
+                      type = "string",
+                      help = 'Specify the log file name pattern, \
+defaults to "guest-%s"')
 
     opts, args = parser.parse_args()
     opts.args = args
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel