From patchwork Thu Jun 12 10:11:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 359070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id DA6161400AB; Thu, 12 Jun 2014 20:12:06 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Wv1zI-0000tl-2L; Thu, 12 Jun 2014 10:12:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Wv1zD-0000td-8L for fwts-devel@lists.ubuntu.com; Thu, 12 Jun 2014 10:11:59 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginm.net ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Wv1zD-0005FR-5x for fwts-devel@lists.ubuntu.com; Thu, 12 Jun 2014 10:11:59 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] fwts-test: arg-show-progress-dialog-0001: fix armhf failures, for test-0002 Date: Thu, 12 Jun 2014 11:11:53 +0100 Message-Id: <1402567913-10008-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.0.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King test-0002.sh unfortunately labelled itself as test-0001 which confused matters when it failed in the same was as test-0001 on slower arm builders. We also need the sed filters to normalise the % progress and test duration output so that this test will work on all architectures. Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Alex Hung --- fwts-test/arg-show-progress-dialog-0001/test-0002.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fwts-test/arg-show-progress-dialog-0001/test-0002.sh b/fwts-test/arg-show-progress-dialog-0001/test-0002.sh index 2a918d9..37fbad7 100755 --- a/fwts-test/arg-show-progress-dialog-0001/test-0002.sh +++ b/fwts-test/arg-show-progress-dialog-0001/test-0002.sh @@ -1,11 +1,23 @@ #!/bin/bash # TEST="Test -D option" -NAME=test-0001.sh +NAME=test-0002.sh TMPLOG=$TMP/progress.log.$$ +TMPLOG_ORIG=$TMP/progress-0001.log.$$ -$FWTS -w 80 -D -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-show-progress-dialog-0001/klog.txt oops klog > $TMPLOG -diff $TMPLOG $FWTSTESTDIR/arg-show-progress-dialog-0001/progress-0001.log >> $FAILURE_LOG +# +# Normalise % progress and seconds to run so it works OK +# with different progress roundings and test durations on +# different architectures. +# +fixup() +{ + sed s'X[0-9]*\.[0-9]*%X00.00%X' | sed s'X[0-9]* secondsX0 secondsX' +} + +$FWTS -w 80 -D -j $FWTSTESTDIR/../data --klog=$FWTSTESTDIR/arg-show-progress-dialog-0001/klog.txt oops klog | fixup > $TMPLOG +fixup < $FWTSTESTDIR/arg-show-progress-dialog-0001/progress-0001.log > $TMPLOG_ORIG +diff $TMPLOG $TMPLOG_ORIG >> $FAILURE_LOG ret=$? if [ $ret -eq 0 ]; then echo PASSED: $TEST, $NAME @@ -13,5 +25,5 @@ else echo FAILED: $TEST, $NAME fi -rm $TMPLOG +rm $TMPLOG $TMPLOG_ORIG exit $ret