Patchwork [5/6,FWTS-TEST] arg-results-0001: use more sensible log name

login
register
mail settings
Submitter Colin King
Date June 20, 2012, 11:34 a.m.
Message ID <1340192066-27620-6-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/166024/
State Accepted
Headers show

Comments

Colin King - June 20, 2012, 11:34 a.m.
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 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 |    2 +-
 arg-results-0001/test-0006.sh |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
Keng-Yu Lin - June 20, 2012, 3:05 p.m.
On Wed, Jun 20, 2012 at 7:34 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-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 |    2 +-
>  arg-results-0001/test-0006.sh |    2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arg-results-0001/test-0001.sh b/arg-results-0001/test-0001.sh
> index 1845e1e..607bb66 100755
> --- a/arg-results-0001/test-0001.sh
> +++ b/arg-results-0001/test-0001.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test --results-output option"
>  NAME=test-0001.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  $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 --git a/arg-results-0001/test-0002.sh b/arg-results-0001/test-0002.sh
> index d36d77e..f067d91 100755
> --- a/arg-results-0001/test-0002.sh
> +++ b/arg-results-0001/test-0002.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test -r option"
>  NAME=test-0002.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  $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 --git a/arg-results-0001/test-0003.sh b/arg-results-0001/test-0003.sh
> index 5180ce3..4ba0a84 100755
> --- a/arg-results-0001/test-0003.sh
> +++ b/arg-results-0001/test-0003.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test --results-output stdout option"
>  NAME=test-0003.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  ($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
> diff --git a/arg-results-0001/test-0004.sh b/arg-results-0001/test-0004.sh
> index 5b884a3..9e19460 100755
> --- a/arg-results-0001/test-0004.sh
> +++ b/arg-results-0001/test-0004.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test -r stdout option"
>  NAME=test-0004.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  ($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
> diff --git a/arg-results-0001/test-0005.sh b/arg-results-0001/test-0005.sh
> index 4e55133..9ccba1a 100755
> --- a/arg-results-0001/test-0005.sh
> +++ b/arg-results-0001/test-0005.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test --results-output option (append)"
>  NAME=test-0005.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  $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
> diff --git a/arg-results-0001/test-0006.sh b/arg-results-0001/test-0006.sh
> index 1735f24..bfb3d6c 100755
> --- a/arg-results-0001/test-0006.sh
> +++ b/arg-results-0001/test-0006.sh
> @@ -2,7 +2,7 @@
>  #
>  TEST="Test -r option (append)"
>  NAME=test-0006.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>  $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
> --
> 1.7.10.4
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Alex Hung - June 21, 2012, 1:08 a.m.
On 06/20/2012 07:34 PM, Colin King wrote:
> From: Colin Ian King<colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King<colin.king@canonical.com>
> ---
>   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 |    2 +-
>   arg-results-0001/test-0006.sh |    2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arg-results-0001/test-0001.sh b/arg-results-0001/test-0001.sh
> index 1845e1e..607bb66 100755
> --- a/arg-results-0001/test-0001.sh
> +++ b/arg-results-0001/test-0001.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test --results-output option"
>   NAME=test-0001.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   $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 --git a/arg-results-0001/test-0002.sh b/arg-results-0001/test-0002.sh
> index d36d77e..f067d91 100755
> --- a/arg-results-0001/test-0002.sh
> +++ b/arg-results-0001/test-0002.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test -r option"
>   NAME=test-0002.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   $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 --git a/arg-results-0001/test-0003.sh b/arg-results-0001/test-0003.sh
> index 5180ce3..4ba0a84 100755
> --- a/arg-results-0001/test-0003.sh
> +++ b/arg-results-0001/test-0003.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test --results-output stdout option"
>   NAME=test-0003.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   ($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
> diff --git a/arg-results-0001/test-0004.sh b/arg-results-0001/test-0004.sh
> index 5b884a3..9e19460 100755
> --- a/arg-results-0001/test-0004.sh
> +++ b/arg-results-0001/test-0004.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test -r stdout option"
>   NAME=test-0004.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   ($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
> diff --git a/arg-results-0001/test-0005.sh b/arg-results-0001/test-0005.sh
> index 4e55133..9ccba1a 100755
> --- a/arg-results-0001/test-0005.sh
> +++ b/arg-results-0001/test-0005.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test --results-output option (append)"
>   NAME=test-0005.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   $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
> diff --git a/arg-results-0001/test-0006.sh b/arg-results-0001/test-0006.sh
> index 1735f24..bfb3d6c 100755
> --- a/arg-results-0001/test-0006.sh
> +++ b/arg-results-0001/test-0006.sh
> @@ -2,7 +2,7 @@
>   #
>   TEST="Test -r option (append)"
>   NAME=test-0006.sh
> -TMPLOG=$TMP/results.log.$$
> +TMPLOG=$TMP/results_$$.log
>
>   $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

Acked-by: Alex Hung <alex.hung@canonical.com>

Patch

diff --git a/arg-results-0001/test-0001.sh b/arg-results-0001/test-0001.sh
index 1845e1e..607bb66 100755
--- a/arg-results-0001/test-0001.sh
+++ b/arg-results-0001/test-0001.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test --results-output option"
 NAME=test-0001.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 $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 --git a/arg-results-0001/test-0002.sh b/arg-results-0001/test-0002.sh
index d36d77e..f067d91 100755
--- a/arg-results-0001/test-0002.sh
+++ b/arg-results-0001/test-0002.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test -r option"
 NAME=test-0002.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 $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 --git a/arg-results-0001/test-0003.sh b/arg-results-0001/test-0003.sh
index 5180ce3..4ba0a84 100755
--- a/arg-results-0001/test-0003.sh
+++ b/arg-results-0001/test-0003.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test --results-output stdout option"
 NAME=test-0003.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 ($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
diff --git a/arg-results-0001/test-0004.sh b/arg-results-0001/test-0004.sh
index 5b884a3..9e19460 100755
--- a/arg-results-0001/test-0004.sh
+++ b/arg-results-0001/test-0004.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test -r stdout option"
 NAME=test-0004.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 ($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
diff --git a/arg-results-0001/test-0005.sh b/arg-results-0001/test-0005.sh
index 4e55133..9ccba1a 100755
--- a/arg-results-0001/test-0005.sh
+++ b/arg-results-0001/test-0005.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test --results-output option (append)"
 NAME=test-0005.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 $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
diff --git a/arg-results-0001/test-0006.sh b/arg-results-0001/test-0006.sh
index 1735f24..bfb3d6c 100755
--- a/arg-results-0001/test-0006.sh
+++ b/arg-results-0001/test-0006.sh
@@ -2,7 +2,7 @@ 
 #
 TEST="Test -r option (append)"
 NAME=test-0006.sh
-TMPLOG=$TMP/results.log.$$
+TMPLOG=$TMP/results_$$.log
 
 $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