Message ID | 1415876168-10596-1-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On 11/13/2014 06:56 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The "AML Disassembler version" text is now different with the > latest ACPICA, so grep for a less specific string that matches newer > and older versions of ACPICA. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > fwts-test/disassemble-0001/test-0001.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fwts-test/disassemble-0001/test-0001.sh b/fwts-test/disassemble-0001/test-0001.sh > index 160defd..4d962b0 100755 > --- a/fwts-test/disassemble-0001/test-0001.sh > +++ b/fwts-test/disassemble-0001/test-0001.sh > @@ -25,8 +25,8 @@ do > # > # Remove lines that contain a tmp file output name in disassembly > # > - grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ > - grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ > + grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ > + grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ > > diff $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ > if [ $? -eq 0 ]; then > @@ -39,5 +39,5 @@ do > rm $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ > done > > -#rm -rf $TMPDIR $TMPLOG > +rm -rf $TMPDIR $TMPLOG > exit $failed > Acked-by: Alex Hung <alex.hung@canonical.com>
On 11/13/2014 06:56 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The "AML Disassembler version" text is now different with the > latest ACPICA, so grep for a less specific string that matches newer > and older versions of ACPICA. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > fwts-test/disassemble-0001/test-0001.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fwts-test/disassemble-0001/test-0001.sh b/fwts-test/disassemble-0001/test-0001.sh > index 160defd..4d962b0 100755 > --- a/fwts-test/disassemble-0001/test-0001.sh > +++ b/fwts-test/disassemble-0001/test-0001.sh > @@ -25,8 +25,8 @@ do > # > # Remove lines that contain a tmp file output name in disassembly > # > - grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ > - grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ > + grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ > + grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ > > diff $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ > if [ $? -eq 0 ]; then > @@ -39,5 +39,5 @@ do > rm $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ > done > > -#rm -rf $TMPDIR $TMPLOG > +rm -rf $TMPDIR $TMPLOG > exit $failed > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/fwts-test/disassemble-0001/test-0001.sh b/fwts-test/disassemble-0001/test-0001.sh index 160defd..4d962b0 100755 --- a/fwts-test/disassemble-0001/test-0001.sh +++ b/fwts-test/disassemble-0001/test-0001.sh @@ -25,8 +25,8 @@ do # # Remove lines that contain a tmp file output name in disassembly # - grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ - grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "AML Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ + grep -v "/tmp/fwts_" $TMPDIR/$I.dsl | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.fixed.$$ + grep -v "/tmp/fwts_" $HERE/$I.dsl.original | grep -v "Disassembler version" | grep -v "Disassembly of" > $TMPDIR/$I.dsl.orig.fixed.$$ diff $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ if [ $? -eq 0 ]; then @@ -39,5 +39,5 @@ do rm $TMPDIR/$I.dsl.fixed.$$ $TMPDIR/$I.dsl.orig.fixed.$$ done -#rm -rf $TMPDIR $TMPLOG +rm -rf $TMPDIR $TMPLOG exit $failed