Patchwork checksum-0001: fix diff return check

login
register
mail settings
Submitter Colin King
Date July 8, 2013, 3:56 p.m.
Message ID <1373299000-32211-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/257566/
State Accepted
Headers show

Comments

Colin King - July 8, 2013, 3:56 p.m.
From: Colin Ian King <colin.king@canonical.com>

Commit 25e82837d8f01dd7928c435082d42e5086073345 introduced a bug
in checking for the diff return. This appeared during some debugging
I did and I somehow foolishly checked this in.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 checksum-0001/test-0001.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Keng-Yu Lin - July 11, 2013, 8:45 a.m.
On Mon, Jul 8, 2013 at 11:56 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Commit 25e82837d8f01dd7928c435082d42e5086073345 introduced a bug
> in checking for the diff return. This appeared during some debugging
> I did and I somehow foolishly checked this in.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  checksum-0001/test-0001.sh | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
> index 89aa14a..79dcd73 100755
> --- a/checksum-0001/test-0001.sh
> +++ b/checksum-0001/test-0001.sh
> @@ -6,9 +6,8 @@ TMPLOG=$TMP/checksum.log.$$
>
>  $FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
>  diff $TMPLOG checksum-0001.log >> $FAILURE_LOG
> -cp $TMPLOG checksum-0001.log
>  ret=$?
> -if [ $ret -eq 0 ]; then
> +if [ $ret -eq 0 ]; then
>         echo PASSED: $TEST, $NAME
>  else
>         echo FAILED: $TEST, $NAME
> --
> 1.8.1.2
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Alex Hung - July 12, 2013, 2:31 a.m.
On 07/08/2013 11:56 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Commit 25e82837d8f01dd7928c435082d42e5086073345 introduced a bug
> in checking for the diff return. This appeared during some debugging
> I did and I somehow foolishly checked this in.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   checksum-0001/test-0001.sh | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
> index 89aa14a..79dcd73 100755
> --- a/checksum-0001/test-0001.sh
> +++ b/checksum-0001/test-0001.sh
> @@ -6,9 +6,8 @@ TMPLOG=$TMP/checksum.log.$$
>
>   $FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
>   diff $TMPLOG checksum-0001.log >> $FAILURE_LOG
> -cp $TMPLOG checksum-0001.log
>   ret=$?
> -if [ $ret -eq 0 ]; then
> +if [ $ret -eq 0 ]; then
>   	echo PASSED: $TEST, $NAME
>   else
>   	echo FAILED: $TEST, $NAME
>

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

Patch

diff --git a/checksum-0001/test-0001.sh b/checksum-0001/test-0001.sh
index 89aa14a..79dcd73 100755
--- a/checksum-0001/test-0001.sh
+++ b/checksum-0001/test-0001.sh
@@ -6,9 +6,8 @@  TMPLOG=$TMP/checksum.log.$$
 
 $FWTS --log-format="%line %owner " -w 120 --dumpfile=acpidump-0001.log checksum - | grep "^[0-9]*[ ]*checksum" | grep -v RSDP | cut -c7- > $TMPLOG
 diff $TMPLOG checksum-0001.log >> $FAILURE_LOG
-cp $TMPLOG checksum-0001.log 
 ret=$?
-if [ $ret -eq 0 ]; then 
+if [ $ret -eq 0 ]; then
 	echo PASSED: $TEST, $NAME
 else
 	echo FAILED: $TEST, $NAME