[PATCH 15/27] arg-results-0001: fix tests to work with new fwts logging
IvanHu
ivan.hu at canonical.com
Thu May 24 06:37:56 UTC 2012
On 05/16/2012 09:20 PM, Colin King wrote:
> From: Colin Ian King<colin.king at canonical.com>
>
> Signed-off-by: Colin Ian King<colin.king at canonical.com>
> ---
> arg-results-0001/results-0005.log | 12 ++++++------
> arg-results-0001/results.log | 6 +++---
> arg-results-0001/test-0001.sh | 2 +-
> arg-results-0001/test-0002.sh | 2 +-
> arg-results-0001/test-0003.sh | 2 +-
> arg-results-0001/test-0004.sh | 2 +-
> arg-results-0001/test-0005.sh | 4 ++--
> arg-results-0001/test-0006.sh | 4 ++--
> 8 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/arg-results-0001/results-0005.log b/arg-results-0001/results-0005.log
> index 6c97efe..f102f0f 100644
> --- a/arg-results-0001/results-0005.log
> +++ b/arg-results-0001/results-0005.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
> @@ -33,12 +33,12 @@ klog that PCIe power management is not optimally configured.
> klog
> klog Found 2 unique errors in kernel log.
> klog
> -klog =========================================================
> +klog ==========================================================
> klog 0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
> klog info only.
> -klog =========================================================
> +klog ==========================================================
> 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
> @@ -72,7 +72,7 @@ klog that PCIe power management is not optimally configured.
> klog
> klog Found 2 unique errors in kernel log.
> klog
> -klog =========================================================
> +klog ==========================================================
> klog 0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
> klog info only.
> -klog =========================================================
> +klog ==========================================================
> diff --git a/arg-results-0001/results.log b/arg-results-0001/results.log
> index 10d65b6..c760b19 100644
> --- a/arg-results-0001/results.log
> +++ b/arg-results-0001/results.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
> @@ -33,7 +33,7 @@ klog that PCIe power management is not optimally configured.
> klog
> klog Found 2 unique errors in kernel log.
> klog
> -klog =========================================================
> +klog ==========================================================
> klog 0 passed, 2 failed, 0 warnings, 0 aborted, 0 skipped, 0
> klog info only.
> -klog =========================================================
> +klog ==========================================================
> diff --git a/arg-results-0001/test-0001.sh b/arg-results-0001/test-0001.sh
> index 04f988e..1845e1e 100755
> --- a/arg-results-0001/test-0001.sh
> +++ b/arg-results-0001/test-0001.sh
> @@ -4,7 +4,7 @@ TEST="Test --results-output option"
> NAME=test-0001.sh
> TMPLOG=$TMP/results.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> grep "^[0-9]*[ ]*klog" $TMPLOG | cut -c7-> $TMPLOG.filtered
> diff $TMPLOG.filtered results.log>> $FAILURE_LOG
> ret=$?
> diff --git a/arg-results-0001/test-0002.sh b/arg-results-0001/test-0002.sh
> index 02972b1..d36d77e 100755
> --- a/arg-results-0001/test-0002.sh
> +++ b/arg-results-0001/test-0002.sh
> @@ -4,7 +4,7 @@ TEST="Test -r option"
> NAME=test-0002.sh
> TMPLOG=$TMP/results.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> grep "^[0-9]*[ ]*klog" $TMPLOG | cut -c7-> $TMPLOG.filtered
> diff $TMPLOG.filtered results.log>> $FAILURE_LOG
> ret=$?
> diff --git a/arg-results-0001/test-0003.sh b/arg-results-0001/test-0003.sh
> index 5953c1c..5180ce3 100755
> --- a/arg-results-0001/test-0003.sh
> +++ b/arg-results-0001/test-0003.sh
> @@ -4,7 +4,7 @@ TEST="Test --results-output stdout option"
> NAME=test-0003.sh
> TMPLOG=$TMP/results.log.$$
>
> -($FWTS -w 80 --klog=klog.txt klog --results-output=stdout | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG )>& /dev/null
> +($FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog --results-output=stdout | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG )>& /dev/null
> diff $TMPLOG results.log>> $FAILURE_LOG
> ret=$?
> if [ $ret -eq 0 ]; then
> diff --git a/arg-results-0001/test-0004.sh b/arg-results-0001/test-0004.sh
> index 6c1521d..5b884a3 100755
> --- a/arg-results-0001/test-0004.sh
> +++ b/arg-results-0001/test-0004.sh
> @@ -4,7 +4,7 @@ TEST="Test -r stdout option"
> NAME=test-0004.sh
> TMPLOG=$TMP/results.log.$$
>
> -($FWTS -w 80 --klog=klog.txt klog -r stdout | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG )>& /dev/null
> +($FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog -r stdout | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG )>& /dev/null
> diff $TMPLOG results.log>> $FAILURE_LOG
> ret=$?
> if [ $ret -eq 0 ]; then
> diff --git a/arg-results-0001/test-0005.sh b/arg-results-0001/test-0005.sh
> index acbe646..4e55133 100755
> --- a/arg-results-0001/test-0005.sh
> +++ b/arg-results-0001/test-0005.sh
> @@ -4,8 +4,8 @@ TEST="Test --results-output option (append)"
> NAME=test-0005.sh
> TMPLOG=$TMP/results.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> -$FWTS -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog --results-output=$TMPLOG>& /dev/null
> grep "^[0-9]*[ ]*klog" $TMPLOG | cut -c7-> $TMPLOG.filtered
> diff $TMPLOG.filtered results-0005.log>> $FAILURE_LOG
> ret=$?
> diff --git a/arg-results-0001/test-0006.sh b/arg-results-0001/test-0006.sh
> index 69cc5c3..1735f24 100755
> --- a/arg-results-0001/test-0006.sh
> +++ b/arg-results-0001/test-0006.sh
> @@ -4,8 +4,8 @@ TEST="Test -r option (append)"
> NAME=test-0006.sh
> TMPLOG=$TMP/results.log.$$
>
> -$FWTS -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> -$FWTS -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> +$FWTS --log-format="%line %owner " -w 80 --klog=klog.txt klog -r $TMPLOG>& /dev/null
> grep "^[0-9]*[ ]*klog" $TMPLOG | cut -c7-> $TMPLOG.filtered
> diff $TMPLOG.filtered results-0005.log>> $FAILURE_LOG
> ret=$?
Acked-by: Ivan Hu<ivan.hu at canonical.com>
More information about the fwts-devel
mailing list