[PATCH] fwts-test: arg-log-format-0001: fix aarch64 failures

[Colin King]

From: Colin Ian King <colin.king at canonical.com>

aarch64 fails on this test because the line numbers are different
from x86 because of a different header length that gets wrapped
around on lines.  So make the test line number agnostic with some
sed replacements.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 fwts-test/arg-log-format-0001/test-0003.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fwts-test/arg-log-format-0001/test-0003.sh b/fwts-test/arg-log-format-0001/test-0003.sh
index 1589325..ed116b3 100755
--- a/fwts-test/arg-log-format-0001/test-0003.sh
+++ b/fwts-test/arg-log-format-0001/test-0003.sh
@@ -3,16 +3,19 @@
 TEST="Test --log-format, %line field"
 NAME=test-0003.sh
 TMPLOG=$TMP/klog.log.$$
+TMPLOG_ORIG=$TMP/klog-0003.log.$$
 TODAY=`date +%d/%m/%y`
 
-$FWTS -w 80 -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-log-format-0001/klog.txt --log-format="%owner %line: " klog - | grep "^klog" | sed sx12\/10\/11x${TODAY}x > $TMPLOG
-diff $TMPLOG $FWTSTESTDIR/arg-log-format-0001/klog-0003.log >> $FAILURE_LOG
+$FWTS -w 80 -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-log-format-0001/klog.txt --log-format="%owner %line: " klog - | grep "^klog" | sed sx12\/10\/11x${TODAY}x | sed "sx[0-9][0-9][0-9][0-9][0-9]:xXXXXX:x" > $TMPLOG
+sed "sx[0-9][0-9][0-9][0-9][0-9]:xXXXXX:x" < $FWTSTESTDIR/arg-log-format-0001/klog-0003.log > $TMPLOG_ORIG
+diff $TMPLOG $TMPLOG_ORIG >> $FAILURE_LOG
 ret=$?
 if [ $ret -eq 0 ]; then 
 	echo PASSED: $TEST, $NAME
 else
 	echo FAILED: $TEST, $NAME
+	cat $FAILURE_LOG
 fi
 
-rm $TMPLOG
+rm $TMPLOG $TMPLOG_ORIG
 exit $ret
-- 
1.9.1