[PATCH] fwts-test: update tests for new olog test from IBM
Colin King
colin.king at canonical.com
Sat Apr 2 18:18:12 UTC 2016
From: Colin Ian King <colin.king at canonical.com>
We need to update some of the test output due to minor changes because
of this new test.
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
fwts-test/arg-help-0001/arg-help-0001.log | 23 ++++++++++++++++++++++
fwts-test/arg-help-0001/arg-help-0002.log | 23 ++++++++++++++++++++++
fwts-test/arg-json-0001/klog-0003.log | 4 +++-
fwts-test/arg-json-0001/klog-0004.log | 4 +++-
.../arg-show-tests-0001/arg-show-tests-0001.log | 1 +
.../arg-show-tests-full-0001.log | 2 ++
6 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/fwts-test/arg-help-0001/arg-help-0001.log b/fwts-test/arg-help-0001/arg-help-0001.log
index b6ad5e2..cf8902f 100644
--- a/fwts-test/arg-help-0001/arg-help-0001.log
+++ b/fwts-test/arg-help-0001/arg-help-0001.log
@@ -37,6 +37,14 @@
tests.
--interactive-experimental Just run Interactive
Experimental tests.
+-J, --json-data-file Specify the file to
+ use for pattern
+ matching on --olog,
+ you may need to
+ specify the
+ json-data-path also
+ if non-default
+ location.
-j, --json-data-path Specify path to fwts
json data files -
default is /usr/share
@@ -79,6 +87,20 @@
width in characters.
--lspci Specify path to lspci
, e.g. --lspci=path.
+-o, --olog Specify Other logs to
+ be analyzed, main
+ usage is for custom
+ log analysis, best to
+ use custom json file
+ for pattern matching,
+ e.g. -o /var/log
+ /my_opal_msglog
+ --json-data-file=olog.json
+ --json-data-path=/home/myuser
+ , on PPC this will
+ default to dumping
+ the OPAL msglog for
+ analysis.
--pm-method Select the power
method to use.
Accepted values are
@@ -235,3 +257,4 @@
Some of this work - Copyright (c) 1999 - 2016, Intel Corp. All rights reserved.
Some of this work - Copyright (c) 2010 - 2016, Canonical.
+Some of this work - Copyright (c) 2016 IBM.
diff --git a/fwts-test/arg-help-0001/arg-help-0002.log b/fwts-test/arg-help-0001/arg-help-0002.log
index b6ad5e2..cf8902f 100644
--- a/fwts-test/arg-help-0001/arg-help-0002.log
+++ b/fwts-test/arg-help-0001/arg-help-0002.log
@@ -37,6 +37,14 @@
tests.
--interactive-experimental Just run Interactive
Experimental tests.
+-J, --json-data-file Specify the file to
+ use for pattern
+ matching on --olog,
+ you may need to
+ specify the
+ json-data-path also
+ if non-default
+ location.
-j, --json-data-path Specify path to fwts
json data files -
default is /usr/share
@@ -79,6 +87,20 @@
width in characters.
--lspci Specify path to lspci
, e.g. --lspci=path.
+-o, --olog Specify Other logs to
+ be analyzed, main
+ usage is for custom
+ log analysis, best to
+ use custom json file
+ for pattern matching,
+ e.g. -o /var/log
+ /my_opal_msglog
+ --json-data-file=olog.json
+ --json-data-path=/home/myuser
+ , on PPC this will
+ default to dumping
+ the OPAL msglog for
+ analysis.
--pm-method Select the power
method to use.
Accepted values are
@@ -235,3 +257,4 @@
Some of this work - Copyright (c) 1999 - 2016, Intel Corp. All rights reserved.
Some of this work - Copyright (c) 2010 - 2016, Canonical.
+Some of this work - Copyright (c) 2016 IBM.
diff --git a/fwts-test/arg-json-0001/klog-0003.log b/fwts-test/arg-json-0001/klog-0003.log
index 2274535..5db8eb9 100644
--- a/fwts-test/arg-json-0001/klog-0003.log
+++ b/fwts-test/arg-json-0001/klog-0003.log
@@ -1,7 +1,9 @@
klog klog: Scan kernel log for errors and warnings.
klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
-klog Cannot read file /xxxx/fooo/klog.json.
+klog Cannot read file /xxxx/fooo/klog.json, check the path and
+klog check that the file exists, you may need to specify -j or
+klog -J.
klog Error parsing kernel log.
klog
klog ==========================================================
diff --git a/fwts-test/arg-json-0001/klog-0004.log b/fwts-test/arg-json-0001/klog-0004.log
index 2274535..5db8eb9 100644
--- a/fwts-test/arg-json-0001/klog-0004.log
+++ b/fwts-test/arg-json-0001/klog-0004.log
@@ -1,7 +1,9 @@
klog klog: Scan kernel log for errors and warnings.
klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
-klog Cannot read file /xxxx/fooo/klog.json.
+klog Cannot read file /xxxx/fooo/klog.json, check the path and
+klog check that the file exists, you may need to specify -j or
+klog -J.
klog Error parsing kernel log.
klog
klog ==========================================================
diff --git a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log
index c306ef9..e5f6248 100644
--- a/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log
+++ b/fwts-test/arg-show-tests-0001/arg-show-tests-0001.log
@@ -99,6 +99,7 @@ Batch tests:
msr MSR register tests.
mtrr MTRR tests.
nx Test if CPU NX is disabled by the BIOS.
+ olog Run OLOG scan and analysis checks.
oops Scan kernel log for Oopses.
osilinux Disassemble DSDT to check for _OSI("Linux").
pcc Processor Clocking Control (PCC) test.
diff --git a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log
index 8ea14ac..1d9f8fa 100644
--- a/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log
+++ b/fwts-test/arg-show-tests-full-0001/arg-show-tests-full-0001.log
@@ -630,6 +630,8 @@ Batch tests:
Test CPU NX capability.
Test all CPUs have same BIOS set NX flag.
Test all CPUs have same msr setting in MSR 0x1a0.
+ olog (1 test):
+ OLOG scan and analysis checks results.
oops (1 test):
Kernel log oops check.
osilinux (1 test):
--
2.7.4
More information about the fwts-devel
mailing list