Patchwork [v3,1/2] live-image/fwts-frontend-text: adding support for both plaintext and html log out by default with --log-type

login
register
mail settings
Submitter Keng-Yu Lin
Date June 14, 2012, 3:47 a.m.
Message ID <1339645676-18503-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/164792/
State Rejected
Headers show

Comments

Keng-Yu Lin - June 14, 2012, 3:47 a.m.
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(-)
Keng-Yu Lin - June 14, 2012, 3:53 a.m.
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.

Patch

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
 			;;