From patchwork Mon Jun 11 19:10:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Van Hoof X-Patchwork-Id: 164239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 22C7EB6FD3 for ; Tue, 12 Jun 2012 05:11:08 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SeA14-0007nb-1f for incoming@patchwork.ozlabs.org; Mon, 11 Jun 2012 19:11:06 +0000 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SeA11-0007mE-3K for fwts-devel@lists.ubuntu.com; Mon, 11 Jun 2012 19:11:03 +0000 X-Authority-Analysis: v=2.0 cv=U/AQ/JXu c=1 sm=0 a=jrUOvm/RFT1SBfzjC7VLzg==:17 a=JJJANRHvMM0A:10 a=2wVUlSmqLjgA:10 a=1XB9yynOT10A:10 a=DfNHnWVPAAAA:8 a=aEcC7dCbABCZfvm55jIA:9 a=lBRciGGoxdUA:10 a=2Tk72b0KvhBO4pZp:21 a=4JzjpISAW1gBNS1T:21 a=jrUOvm/RFT1SBfzjC7VLzg==:117 X-Cloudmark-Score: 0 X-Originating-IP: 174.109.107.185 Received: from [174.109.107.185] ([174.109.107.185:11375] helo=hatori.itb.ouwish.com) by cdptpa-oedge01.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 27/90-07841-4C246DF4; Mon, 11 Jun 2012 19:11:02 +0000 Received: from hatori.itb.ouwish.com (localhost [127.0.0.1]) by hatori.itb.ouwish.com (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id q5BJAwIe010584; Mon, 11 Jun 2012 15:10:58 -0400 Received: (from vanhoof@localhost) by hatori.itb.ouwish.com (8.14.4/8.14.4/Submit) id q5BJAu4l010565; Mon, 11 Jun 2012 15:10:56 -0400 From: Chris Van Hoof To: fwts-devel@lists.ubuntu.com Subject: [PATCH] live-image/fwts-frontend-text: adding support for both html and plaintext logging by default and updating a symbolic link at the top level WORK_DIR to the latest results.html for quick access after testing Date: Mon, 11 Jun 2012 15:10:54 -0400 Message-Id: <1339441854-10482-1-git-send-email-vanhoof@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com Signed-off-by: Chris Van Hoof Acked-by: Colin Ian King --- live-image/fwts-frontend-text | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text index b9c0c1f..9ccac5d 100755 --- a/live-image/fwts-frontend-text +++ b/live-image/fwts-frontend-text @@ -76,7 +76,7 @@ do_test() num_tests=`fwts $1 --show-tests | wc -l` num_tests=$((num_tests - 1)) if [ $num_tests -gt 0 ]; then - fwts --force-clean --skip-test=s3,s4 $1 --show-progress-dialog | dialog --backtitle "$FWTS" --title "$2" --gauge "" 13 80 0 + fwts --force-clean --skip-test=s3,s4 $1 --show-progress-dialog --log-type plaintext,html | dialog --backtitle "$FWTS" --title "$2" --gauge "" 13 80 0 fi } @@ -130,7 +130,7 @@ select_tests() dialog --backtitle "$FWTS" --title "No Tests Selected!" --msgbox \ " You did not select any tests to be run." 5 50 else - fwts --force-clean $run_tests --show-progress-dialog | dialog --backtitle "$FWTS" --title "$2" --gauge "" 15 80 0 + fwts --force-clean $run_tests --show-progress-dialog --log-type plaintext,html | dialog --backtitle "$FWTS" --title "$2" --gauge "" 15 80 0 done_tests_finish fi ;; @@ -195,6 +195,13 @@ no_tests_finish() # done_tests_finish() { + if [ -n "${CASPER_DETECTED:+x}" ]; then + cd $WORK_DIR + ln -sf ./results.html ../../results.html + else + ln -sf $WORK_DIR/results.html /fwts/ + fi + dialog --backtitle "$FWTS" --title "Testing Complete" --yesno \ "The results can be found on the USB stick in the\n the directory: /fwts/$FWTS_DATE/$FWTS_TIME/results.log\n\n