Message ID | 1337174459-21597-24-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-results-no-separators-0001/test-0001.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arg-results-no-separators-0001/test-0001.sh b/arg-results-no-separators-0001/test-0001.sh > index 47f9fd2..fb9b7f3 100755 > --- a/arg-results-no-separators-0001/test-0001.sh > +++ b/arg-results-no-separators-0001/test-0001.sh > @@ -4,7 +4,7 @@ TEST="Test --results-no-separators option" > NAME=test-0001.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > +$FWTS --log-format="%line %owner " -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG > diff $TMPLOG klog-0001.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-results-no-separators-0001/test-0001.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arg-results-no-separators-0001/test-0001.sh b/arg-results-no-separators-0001/test-0001.sh > index 47f9fd2..fb9b7f3 100755 > --- a/arg-results-no-separators-0001/test-0001.sh > +++ b/arg-results-no-separators-0001/test-0001.sh > @@ -4,7 +4,7 @@ TEST="Test --results-no-separators option" > NAME=test-0001.sh > TMPLOG=$TMP/klog.log.$$ > > -$FWTS -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > +$FWTS --log-format="%line %owner " -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7-> $TMPLOG > diff $TMPLOG klog-0001.log>> $FAILURE_LOG > ret=$? > if [ $ret -eq 0 ]; then Acked-by: Ivan Hu<ivan.hu@canonical.com>
diff --git a/arg-results-no-separators-0001/test-0001.sh b/arg-results-no-separators-0001/test-0001.sh index 47f9fd2..fb9b7f3 100755 --- a/arg-results-no-separators-0001/test-0001.sh +++ b/arg-results-no-separators-0001/test-0001.sh @@ -4,7 +4,7 @@ TEST="Test --results-no-separators option" NAME=test-0001.sh TMPLOG=$TMP/klog.log.$$ -$FWTS -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG +$FWTS --log-format="%line %owner " -w 80 --results-no-separators --klog=klog.txt klog - | grep "^[0-9]*[ ]*klog" | cut -c7- > $TMPLOG diff $TMPLOG klog-0001.log >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then