Patchwork [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 Chris Van Hoof
Date June 11, 2012, 11:02 p.m.
Message ID <1339455774-18442-2-git-send-email-vanhoof@canonical.com>
Download mbox | patch
Permalink /patch/164276/
State Rejected
Headers show

Comments

Chris Van Hoof - June 11, 2012, 11:02 p.m.
Signed-off-by: Chris Van Hoof <vanhoof@canonical.com>
---
 live-image/fwts-frontend-text |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Colin King - June 12, 2012, 8:12 a.m.
On 12/06/12 00:02, Chris Van Hoof wrote:
> 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
>   			;;
>

Acked-by: Colin Ian King <colin.king@canonical.com>
Keng-Yu Lin - June 13, 2012, 9:54 a.m.
On Tue, Jun 12, 2012 at 7:02 AM, Chris Van Hoof <vanhoof@canonical.com> wrote:
> 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
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>

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