Message ID | 1337174459-21597-18-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On Wed, May 16, 2012 at 9:20 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > arg-width-0001/klog-0001.log | 6 +++--- > arg-width-0001/klog-0002.log | 6 +++--- > arg-width-0001/klog-0003.log | 6 +++--- > arg-width-0001/klog-0004.log | 6 +++--- > arg-width-0001/test-0001.sh | 2 +- > arg-width-0001/test-0002.sh | 2 +- > arg-width-0001/test-0003.sh | 2 +- > arg-width-0001/test-0004.sh | 2 +- > arg-width-0001/test-0005.sh | 2 +- > arg-width-0001/test-0006.sh | 2 +- > arg-width-0001/test-0007.sh | 2 +- > arg-width-0001/test-0008.sh | 2 +- > 12 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/arg-width-0001/klog-0001.log b/arg-width-0001/klog-0001.log > index ea70b88..2adfd43 100644 > --- a/arg-width-0001/klog-0001.log > +++ b/arg-width-0001/klog-0001.log > @@ -1,9 +1,9 @@ > klog Scan kernel log for errors and warnings. > -klog --------------------------------------------------------- > +klog ---------------------------------------------------------- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ========================================================= > +klog ========================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 > klog info only. > -klog ========================================================= > +klog ========================================================== > diff --git a/arg-width-0001/klog-0002.log b/arg-width-0001/klog-0002.log > index 1222a80..a3e999f 100644 > --- a/arg-width-0001/klog-0002.log > +++ b/arg-width-0001/klog-0002.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ------------------------------------------------------------------- > +klog -------------------------------------------------------------------- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog =================================================================== > +klog ==================================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog =================================================================== > +klog ==================================================================== > diff --git a/arg-width-0001/klog-0003.log b/arg-width-0001/klog-0003.log > index c7e3aff..690bed5 100644 > --- a/arg-width-0001/klog-0003.log > +++ b/arg-width-0001/klog-0003.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ----------------------------------------------------------------------------- > +klog ------------------------------------------------------------------------------ > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ============================================================================= > +klog ============================================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog ============================================================================= > +klog ============================================================================== > diff --git a/arg-width-0001/klog-0004.log b/arg-width-0001/klog-0004.log > index c7a3275..08fcf6a 100644 > --- a/arg-width-0001/klog-0004.log > +++ b/arg-width-0001/klog-0004.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- > ---- > +klog ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- > ----- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ==== > +klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ===== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ==== > +klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ===== > diff --git a/arg-width-0001/test-0001.sh b/arg-width-0001/test-0001.sh > index d7142eb..a33e5d4 100755 > --- a/arg-width-0001/test-0001.sh > +++ b/arg-width-0001/test-0001.sh > @@ -4,7 +4,7 @@ TEST="Test -w 80" > NAME=test-0001.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " -w 80 --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-width-0001/test-0002.sh b/arg-width-0001/test-0002.sh > index 1249835..1f52f28 100755 > --- a/arg-width-0001/test-0002.sh > +++ b/arg-width-0001/test-0002.sh > @@ -4,7 +4,7 @@ TEST="Test -w 90" > NAME=test-0002.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " -w 90 --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-width-0001/test-0003.sh b/arg-width-0001/test-0003.sh > index ac77cc1..8d67f02 100755 > --- a/arg-width-0001/test-0003.sh > +++ b/arg-width-0001/test-0003.sh > @@ -4,7 +4,7 @@ TEST="Test -w 100" > NAME=test-0003.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " -w 100 --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-width-0001/test-0004.sh b/arg-width-0001/test-0004.sh > index 85bf71b..ddad193 100755 > --- a/arg-width-0001/test-0004.sh > +++ b/arg-width-0001/test-0004.sh > @@ -4,7 +4,7 @@ TEST="Test -w 1000" > NAME=test-0004.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > diff $TMPLOG klog-0004.log >> $FAILURE_LOG > ret=$? > if [ $ret -eq 0 ]; then > diff --git a/arg-width-0001/test-0005.sh b/arg-width-0001/test-0005.sh > index e46ec94..bf1c18e 100755 > --- a/arg-width-0001/test-0005.sh > +++ b/arg-width-0001/test-0005.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=80" > NAME=test-0005.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=80 --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-width-0001/test-0006.sh b/arg-width-0001/test-0006.sh > index f5eea2d..97864ad 100755 > --- a/arg-width-0001/test-0006.sh > +++ b/arg-width-0001/test-0006.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=90" > NAME=test-0006.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=90 --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-width-0001/test-0007.sh b/arg-width-0001/test-0007.sh > index 85103e1..c8efa7d 100755 > --- a/arg-width-0001/test-0007.sh > +++ b/arg-width-0001/test-0007.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=100" > NAME=test-0007.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=100 --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-width-0001/test-0008.sh b/arg-width-0001/test-0008.sh > index 4097d86..0ae3759 100755 > --- a/arg-width-0001/test-0008.sh > +++ b/arg-width-0001/test-0008.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=1000" > NAME=test-0008.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=1000 --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 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
On 05/16/2012 09:20 PM, Colin King wrote: > From: Colin Ian King<colin.king@canonical.com> > > Signed-off-by: Colin Ian King<colin.king@canonical.com> > --- > arg-width-0001/klog-0001.log | 6 +++--- > arg-width-0001/klog-0002.log | 6 +++--- > arg-width-0001/klog-0003.log | 6 +++--- > arg-width-0001/klog-0004.log | 6 +++--- > arg-width-0001/test-0001.sh | 2 +- > arg-width-0001/test-0002.sh | 2 +- > arg-width-0001/test-0003.sh | 2 +- > arg-width-0001/test-0004.sh | 2 +- > arg-width-0001/test-0005.sh | 2 +- > arg-width-0001/test-0006.sh | 2 +- > arg-width-0001/test-0007.sh | 2 +- > arg-width-0001/test-0008.sh | 2 +- > 12 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/arg-width-0001/klog-0001.log b/arg-width-0001/klog-0001.log > index ea70b88..2adfd43 100644 > --- a/arg-width-0001/klog-0001.log > +++ b/arg-width-0001/klog-0001.log > @@ -1,9 +1,9 @@ > klog Scan kernel log for errors and warnings. > -klog --------------------------------------------------------- > +klog ---------------------------------------------------------- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ========================================================= > +klog ========================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 > klog info only. > -klog ========================================================= > +klog ========================================================== > diff --git a/arg-width-0001/klog-0002.log b/arg-width-0001/klog-0002.log > index 1222a80..a3e999f 100644 > --- a/arg-width-0001/klog-0002.log > +++ b/arg-width-0001/klog-0002.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ------------------------------------------------------------------- > +klog -------------------------------------------------------------------- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog =================================================================== > +klog ==================================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog =================================================================== > +klog ==================================================================== > diff --git a/arg-width-0001/klog-0003.log b/arg-width-0001/klog-0003.log > index c7e3aff..690bed5 100644 > --- a/arg-width-0001/klog-0003.log > +++ b/arg-width-0001/klog-0003.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ----------------------------------------------------------------------------- > +klog ------------------------------------------------------------------------------ > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ============================================================================= > +klog ============================================================================== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog ============================================================================= > +klog ============================================================================== > diff --git a/arg-width-0001/klog-0004.log b/arg-width-0001/klog-0004.log > index c7a3275..08fcf6a 100644 > --- a/arg-width-0001/klog-0004.log > +++ b/arg-width-0001/klog-0004.log > @@ -1,8 +1,8 @@ > klog Scan kernel log for errors and warnings. > -klog ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- > ---- > +klog ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- > ----- > klog Test 1 of 1: Kernel log error check. > klog PASSED: Test 1, Found no errors in kernel log. > klog > -klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ==== > +klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ===== > klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. > -klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ==== > +klog ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= > ===== > diff --git a/arg-width-0001/test-0001.sh b/arg-width-0001/test-0001.sh > index d7142eb..a33e5d4 100755 > --- a/arg-width-0001/test-0001.sh > +++ b/arg-width-0001/test-0001.sh > @@ -4,7 +4,7 @@ TEST="Test -w 80" > NAME=test-0001.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " -w 80 --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-width-0001/test-0002.sh b/arg-width-0001/test-0002.sh > index 1249835..1f52f28 100755 > --- a/arg-width-0001/test-0002.sh > +++ b/arg-width-0001/test-0002.sh > @@ -4,7 +4,7 @@ TEST="Test -w 90" > NAME=test-0002.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " -w 90 --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-width-0001/test-0003.sh b/arg-width-0001/test-0003.sh > index ac77cc1..8d67f02 100755 > --- a/arg-width-0001/test-0003.sh > +++ b/arg-width-0001/test-0003.sh > @@ -4,7 +4,7 @@ TEST="Test -w 100" > NAME=test-0003.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " -w 100 --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-width-0001/test-0004.sh b/arg-width-0001/test-0004.sh > index 85bf71b..ddad193 100755 > --- a/arg-width-0001/test-0004.sh > +++ b/arg-width-0001/test-0004.sh > @@ -4,7 +4,7 @@ TEST="Test -w 1000" > NAME=test-0004.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > diff $TMPLOG klog-0004.log>> $FAILURE_LOG > ret=$? > if [ $ret -eq 0 ]; then > diff --git a/arg-width-0001/test-0005.sh b/arg-width-0001/test-0005.sh > index e46ec94..bf1c18e 100755 > --- a/arg-width-0001/test-0005.sh > +++ b/arg-width-0001/test-0005.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=80" > NAME=test-0005.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=80 --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-width-0001/test-0006.sh b/arg-width-0001/test-0006.sh > index f5eea2d..97864ad 100755 > --- a/arg-width-0001/test-0006.sh > +++ b/arg-width-0001/test-0006.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=90" > NAME=test-0006.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=90 --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-width-0001/test-0007.sh b/arg-width-0001/test-0007.sh > index 85103e1..c8efa7d 100755 > --- a/arg-width-0001/test-0007.sh > +++ b/arg-width-0001/test-0007.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=100" > NAME=test-0007.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=100 --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-width-0001/test-0008.sh b/arg-width-0001/test-0008.sh > index 4097d86..0ae3759 100755 > --- a/arg-width-0001/test-0008.sh > +++ b/arg-width-0001/test-0008.sh > @@ -4,7 +4,7 @@ TEST="Test --log-width=1000" > NAME=test-0008.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS --log-width=1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " --log-width=1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > diff $TMPLOG klog-0004.log>> $FAILURE_LOG > ret=$? > if [ $ret -eq 0 ]; then Acked-by: Ivan Hu<ivan.hu@canonical.com>
diff --git a/arg-width-0001/klog-0001.log b/arg-width-0001/klog-0001.log index ea70b88..2adfd43 100644 --- a/arg-width-0001/klog-0001.log +++ b/arg-width-0001/klog-0001.log @@ -1,9 +1,9 @@ klog Scan kernel log for errors and warnings. -klog --------------------------------------------------------- +klog ---------------------------------------------------------- klog Test 1 of 1: Kernel log error check. klog PASSED: Test 1, Found no errors in kernel log. klog -klog ========================================================= +klog ========================================================== klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 klog info only. -klog ========================================================= +klog ========================================================== diff --git a/arg-width-0001/klog-0002.log b/arg-width-0001/klog-0002.log index 1222a80..a3e999f 100644 --- a/arg-width-0001/klog-0002.log +++ b/arg-width-0001/klog-0002.log @@ -1,8 +1,8 @@ klog Scan kernel log for errors and warnings. -klog ------------------------------------------------------------------- +klog -------------------------------------------------------------------- klog Test 1 of 1: Kernel log error check. klog PASSED: Test 1, Found no errors in kernel log. klog -klog =================================================================== +klog ==================================================================== klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. -klog =================================================================== +klog ==================================================================== diff --git a/arg-width-0001/klog-0003.log b/arg-width-0001/klog-0003.log index c7e3aff..690bed5 100644 --- a/arg-width-0001/klog-0003.log +++ b/arg-width-0001/klog-0003.log @@ -1,8 +1,8 @@ klog Scan kernel log for errors and warnings. -klog ----------------------------------------------------------------------------- +klog ------------------------------------------------------------------------------ klog Test 1 of 1: Kernel log error check. klog PASSED: Test 1, Found no errors in kernel log. klog -klog ============================================================================= +klog ============================================================================== klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. -klog ============================================================================= +klog ============================================================================== diff --git a/arg-width-0001/klog-0004.log b/arg-width-0001/klog-0004.log index c7a3275..08fcf6a 100644 --- a/arg-width-0001/klog-0004.log +++ b/arg-width-0001/klog-0004.log @@ -1,8 +1,8 @@ klog Scan kernel log for errors and warnings. -klog ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +klog ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ klog Test 1 of 1: Kernel log error check. klog PASSED: Test 1, Found no errors in kernel log. klog -klog ================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= +klog ================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== klog 1 passed, 0 failed, 0 warnings, 0 aborted, 0 skipped, 0 info only. -klog ================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================= +klog ================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================== diff --git a/arg-width-0001/test-0001.sh b/arg-width-0001/test-0001.sh index d7142eb..a33e5d4 100755 --- a/arg-width-0001/test-0001.sh +++ b/arg-width-0001/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test -w 80" NAME=test-0001.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --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-width-0001/test-0002.sh b/arg-width-0001/test-0002.sh index 1249835..1f52f28 100755 --- a/arg-width-0001/test-0002.sh +++ b/arg-width-0001/test-0002.sh @@ -4,7 +4,7 @@ TEST="Test -w 90" NAME=test-0002.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 90 --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-width-0001/test-0003.sh b/arg-width-0001/test-0003.sh index ac77cc1..8d67f02 100755 --- a/arg-width-0001/test-0003.sh +++ b/arg-width-0001/test-0003.sh @@ -4,7 +4,7 @@ TEST="Test -w 100" NAME=test-0003.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 100 --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-width-0001/test-0004.sh b/arg-width-0001/test-0004.sh index 85bf71b..ddad193 100755 --- a/arg-width-0001/test-0004.sh +++ b/arg-width-0001/test-0004.sh @@ -4,7 +4,7 @@ TEST="Test -w 1000" NAME=test-0004.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG diff $TMPLOG klog-0004.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then diff --git a/arg-width-0001/test-0005.sh b/arg-width-0001/test-0005.sh index e46ec94..bf1c18e 100755 --- a/arg-width-0001/test-0005.sh +++ b/arg-width-0001/test-0005.sh @@ -4,7 +4,7 @@ TEST="Test --log-width=80" NAME=test-0005.sh TMPLOG=$TMP/klog.log.$$ -$FWTS --log-width=80 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " --log-width=80 --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-width-0001/test-0006.sh b/arg-width-0001/test-0006.sh index f5eea2d..97864ad 100755 --- a/arg-width-0001/test-0006.sh +++ b/arg-width-0001/test-0006.sh @@ -4,7 +4,7 @@ TEST="Test --log-width=90" NAME=test-0006.sh TMPLOG=$TMP/klog.log.$$ -$FWTS --log-width=90 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " --log-width=90 --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-width-0001/test-0007.sh b/arg-width-0001/test-0007.sh index 85103e1..c8efa7d 100755 --- a/arg-width-0001/test-0007.sh +++ b/arg-width-0001/test-0007.sh @@ -4,7 +4,7 @@ TEST="Test --log-width=100" NAME=test-0007.sh TMPLOG=$TMP/klog.log.$$ -$FWTS --log-width=100 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " --log-width=100 --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-width-0001/test-0008.sh b/arg-width-0001/test-0008.sh index 4097d86..0ae3759 100755 --- a/arg-width-0001/test-0008.sh +++ b/arg-width-0001/test-0008.sh @@ -4,7 +4,7 @@ TEST="Test --log-width=1000" NAME=test-0008.sh TMPLOG=$TMP/klog.log.$$ -$FWTS --log-width=1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " --log-width=1000 --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG diff $TMPLOG klog-0004.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then