diff mbox

live-image/fwts-frontend-text: add a selection for recommended

Message ID 1450157275-25455-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung Dec. 15, 2015, 5:27 a.m. UTC
This section includes a set of more common used tests

Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 live-image/fwts-frontend-text | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Colin Ian King Dec. 15, 2015, 9:25 a.m. UTC | #1
On 15/12/15 05:27, Alex Hung wrote:
> This section includes a set of more common used tests
> 
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  live-image/fwts-frontend-text | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
> index 213eb8d..9c07d4a 100755
> --- a/live-image/fwts-frontend-text
> +++ b/live-image/fwts-frontend-text
> @@ -235,12 +235,13 @@ do
>  	dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \
>    		"This will run a suite of firmware tests that will check the BIOS and ACPI tables. It can also find issues that can cause Linux problems.\n\n\
>  The default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue:" \
> -		20 70 6 \
> +		22 70 6 \
>  		1 "All Batch Tests" on \
>  		2 "ACPI Tests" off \
>  		3 "UEFI Tests" off \
> -		4 "Select Individual Tests" off \
> -		5 "Abort Testing" off \
> +		4 "Recommended Tests" off \
> +		5 "Select Individual Tests" off \
> +		6 "Abort Testing" off \
>  	2> $OPTIONS
>  
>  	case $? in
> @@ -260,9 +261,13 @@ The default below is to run just all the Batch Tests, but you can select more te
>  			done_tests_finish
>  			;;
>  		'4')
> -			select_tests
> +			do_test "version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium" 'Running Recommended Tests'
> +			done_tests_finish
>  			;;
>  		'5')
> +			select_tests
> +			;;
> +		'6')
>  			no_tests_finish
>  			;;
>  		esac
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu Dec. 16, 2015, 6:16 a.m. UTC | #2
On 2015年12月15日 13:27, Alex Hung wrote:
> This section includes a set of more common used tests
>
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>   live-image/fwts-frontend-text | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
> index 213eb8d..9c07d4a 100755
> --- a/live-image/fwts-frontend-text
> +++ b/live-image/fwts-frontend-text
> @@ -235,12 +235,13 @@ do
>   	dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \
>     		"This will run a suite of firmware tests that will check the BIOS and ACPI tables. It can also find issues that can cause Linux problems.\n\n\
>   The default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue:" \
> -		20 70 6 \
> +		22 70 6 \
>   		1 "All Batch Tests" on \
>   		2 "ACPI Tests" off \
>   		3 "UEFI Tests" off \
> -		4 "Select Individual Tests" off \
> -		5 "Abort Testing" off \
> +		4 "Recommended Tests" off \
> +		5 "Select Individual Tests" off \
> +		6 "Abort Testing" off \
>   	2> $OPTIONS
>
>   	case $? in
> @@ -260,9 +261,13 @@ The default below is to run just all the Batch Tests, but you can select more te
>   			done_tests_finish
>   			;;
>   		'4')
> -			select_tests
> +			do_test "version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium" 'Running Recommended Tests'
> +			done_tests_finish
>   			;;
>   		'5')
> +			select_tests
> +			;;
> +		'6')
>   			no_tests_finish
>   			;;
>   		esac
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
index 213eb8d..9c07d4a 100755
--- a/live-image/fwts-frontend-text
+++ b/live-image/fwts-frontend-text
@@ -235,12 +235,13 @@  do
 	dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \
   		"This will run a suite of firmware tests that will check the BIOS and ACPI tables. It can also find issues that can cause Linux problems.\n\n\
 The default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue:" \
-		20 70 6 \
+		22 70 6 \
 		1 "All Batch Tests" on \
 		2 "ACPI Tests" off \
 		3 "UEFI Tests" off \
-		4 "Select Individual Tests" off \
-		5 "Abort Testing" off \
+		4 "Recommended Tests" off \
+		5 "Select Individual Tests" off \
+		6 "Abort Testing" off \
 	2> $OPTIONS
 
 	case $? in
@@ -260,9 +261,13 @@  The default below is to run just all the Batch Tests, but you can select more te
 			done_tests_finish
 			;;
 		'4')
-			select_tests
+			do_test "version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium" 'Running Recommended Tests'
+			done_tests_finish
 			;;
 		'5')
+			select_tests
+			;;
+		'6')
 			no_tests_finish
 			;;
 		esac