Patchwork [23/27] arg-results-no-separators-0001: fix tests to work with new fwts logging

login
register
mail settings
Submitter Colin King
Date May 16, 2012, 1:20 p.m.
Message ID <1337174459-21597-24-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/159661/
State Accepted
Headers show

Comments

Colin King - May 16, 2012, 1:20 p.m.
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(-)
Keng-Yu Lin - May 23, 2012, 6:57 a.m.
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>
Ivan Hu - May 24, 2012, 6:40 a.m.
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>

Patch

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