[PATCH 13/27] arg-json-0001: fix tests to work with new fwts logging
Colin King
colin.king at canonical.com
Wed May 16 13:20:44 UTC 2012
From: Colin Ian King <colin.king at canonical.com>
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
arg-json-0001/klog-0001.log | 6 +++---
arg-json-0001/klog-0002.log | 6 +++---
arg-json-0001/klog-0003.log | 6 +++---
arg-json-0001/klog-0004.log | 6 +++---
arg-json-0001/test-0001.sh | 2 +-
arg-json-0001/test-0002.sh | 2 +-
arg-json-0001/test-0003.sh | 2 +-
arg-json-0001/test-0004.sh | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arg-json-0001/klog-0001.log b/arg-json-0001/klog-0001.log
index f799806..ec8e9e2 100644
--- a/arg-json-0001/klog-0001.log
+++ b/arg-json-0001/klog-0001.log
@@ -1,5 +1,5 @@
klog Scan kernel log for errors and warnings.
-klog ---------------------------------------------------------
+klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
klog FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
klog Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
@@ -23,7 +23,7 @@ klog strings by default.
klog
klog Found 1 unique errors in kernel log.
klog
-klog =========================================================
+klog ==========================================================
klog 0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
klog info only.
-klog =========================================================
+klog ==========================================================
diff --git a/arg-json-0001/klog-0002.log b/arg-json-0001/klog-0002.log
index f799806..ec8e9e2 100644
--- a/arg-json-0001/klog-0002.log
+++ b/arg-json-0001/klog-0002.log
@@ -1,5 +1,5 @@
klog Scan kernel log for errors and warnings.
-klog ---------------------------------------------------------
+klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
klog FAILED [HIGH] KlogACPIBIOSBugMultipleAPIC: Test 1, HIGH
klog Kernel message: [ 0.000000] ACPI: BIOS bug: multiple APIC
@@ -23,7 +23,7 @@ klog strings by default.
klog
klog Found 1 unique errors in kernel log.
klog
-klog =========================================================
+klog ==========================================================
klog 0 passed, 1 failed, 0 warnings, 0 aborted, 0 skipped, 0
klog info only.
-klog =========================================================
+klog ==========================================================
diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
index a943a3b..fce0e32 100644
--- a/arg-json-0001/klog-0003.log
+++ b/arg-json-0001/klog-0003.log
@@ -1,10 +1,10 @@
klog Scan kernel log for errors and warnings.
-klog ---------------------------------------------------------
+klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
klog Cannot load klog data from /xxxx/fooo/klog.json.
klog Error parsing kernel log.
klog
-klog =========================================================
+klog ==========================================================
klog 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
klog info only.
-klog =========================================================
+klog ==========================================================
diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
index a943a3b..fce0e32 100644
--- a/arg-json-0001/klog-0004.log
+++ b/arg-json-0001/klog-0004.log
@@ -1,10 +1,10 @@
klog Scan kernel log for errors and warnings.
-klog ---------------------------------------------------------
+klog ----------------------------------------------------------
klog Test 1 of 1: Kernel log error check.
klog Cannot load klog data from /xxxx/fooo/klog.json.
klog Error parsing kernel log.
klog
-klog =========================================================
+klog ==========================================================
klog 0 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0
klog info only.
-klog =========================================================
+klog ==========================================================
diff --git a/arg-json-0001/test-0001.sh b/arg-json-0001/test-0001.sh
index 53e9e27..56b61fd 100755
--- a/arg-json-0001/test-0001.sh
+++ b/arg-json-0001/test-0001.sh
@@ -5,7 +5,7 @@ NAME=test-0001.sh
TMPLOG=$TMP/klog.log.$$
HERE=`pwd`
-$FWTS -w 80 --json-data-path=$HERE --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --json-data-path=$HERE --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
diff $TMPLOG klog-0001.log >> $FAILURE_LOG
ret=$?
if [ $ret -eq 0 ]; then
diff --git a/arg-json-0001/test-0002.sh b/arg-json-0001/test-0002.sh
index 35bd315..4992302 100755
--- a/arg-json-0001/test-0002.sh
+++ b/arg-json-0001/test-0002.sh
@@ -5,7 +5,7 @@ NAME=test-0002.sh
TMPLOG=$TMP/klog.log.$$
HERE=`pwd`
-$FWTS -w 80 -j $HERE --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 -j $HERE --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
diff $TMPLOG klog-0002.log >> $FAILURE_LOG
ret=$?
if [ $ret -eq 0 ]; then
diff --git a/arg-json-0001/test-0003.sh b/arg-json-0001/test-0003.sh
index dac489b..c6b90cb 100755
--- a/arg-json-0001/test-0003.sh
+++ b/arg-json-0001/test-0003.sh
@@ -5,7 +5,7 @@ NAME=test-0003.sh
TMPLOG=$TMP/klog.log.$$
HERE=`pwd`
-$FWTS -w 80 --json-data-path=/xxxx/fooo --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 --json-data-path=/xxxx/fooo --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
diff $TMPLOG klog-0003.log >> $FAILURE_LOG
ret=$?
if [ $ret -eq 0 ]; then
diff --git a/arg-json-0001/test-0004.sh b/arg-json-0001/test-0004.sh
index b26dc84..e8fdbc8 100755
--- a/arg-json-0001/test-0004.sh
+++ b/arg-json-0001/test-0004.sh
@@ -5,7 +5,7 @@ NAME=test-0004.sh
TMPLOG=$TMP/klog.log.$$
HERE=`pwd`
-$FWTS -w 80 -j /xxxx/fooo --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
+$FWTS --log-format="%line %owner " -w 80 -j /xxxx/fooo --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG
diff $TMPLOG klog-0004.log >> $FAILURE_LOG
ret=$?
if [ $ret -eq 0 ]; then
--
1.7.10
More information about the fwts-devel
mailing list