| Message ID | 1339645676-18503-1-git-send-email-kengyu@canonical.com |
|---|---|
| State | Rejected |
| Headers | show |
On Thu, Jun 14, 2012 at 11:47 AM, Keng-Yu Lin <kengyu@canonical.com> wrote: > From: Chris Van Hoof <vanhoof@canonical.com> > > Signed-off-by: Chris Van Hoof <vanhoof@canonical.com> > --- > live-image/fwts-frontend-text | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text > index b9c0c1f..90c0fc7 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 > ;; > -- > 1.7.9.5 > NAK, Chris already sent his.
diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text index b9c0c1f..90c0fc7 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 ;;