[PATCH 1/2] live-image: remove unnecessary -skip-test=s3,s4 argument

Alex Hung alex.hung at canonical.com
Tue Jun 8 19:50:48 UTC 2021


s3 and s4 are never included in these tests.

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

diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
index 6e267497..430ea271 100755
--- a/live-image/fwts-frontend-text
+++ b/live-image/fwts-frontend-text
@@ -401,22 +401,22 @@ do
 					FWTS_OPTIONS="--batch"
 					;;
 				*)
-					FWTS_OPTIONS="--batch --uefitests --skip-test=s3,s4"
+					FWTS_OPTIONS="--batch --uefitests"
 					;;
 			esac
 			do_test "${FWTS_OPTIONS}" 'Running Batch Tests'
 			done_tests_finish
 			;;
 		'ACPI')
-			do_test "--acpitests --skip-test=s3,s4" 'Running ACPI Tests'
+			do_test "--acpitests" 'Running ACPI Tests'
 			done_tests_finish
 			;;
 		'UEFI')
-			do_test "--uefitests --skip-test=s3,s4" 'Running UEFI Tests'
+			do_test "--uefitests" 'Running UEFI Tests'
 			done_tests_finish
 			;;
 		'SBBR')
-			do_test "--sbbr --skip-test=s3,s4" 'Server Base Boot Requirements (SBBR) Tests'
+			do_test "--sbbr" 'Server Base Boot Requirements (SBBR) Tests'
 			done_tests_finish
 			;;
 		'Recommended')
@@ -425,7 +425,7 @@ do
 					FWTS_OPTIONS="--batch"
 					;;
 				*)
-					FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium --skip-test=s3,s4"
+					FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium"
 					;;
 			esac
 
@@ -433,7 +433,7 @@ do
 			done_tests_finish
 			;;
 		'Recommended for IFV')
-			FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv --skip-test=s3,s4"
+			FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv"
 			do_test "${FWTS_OPTIONS}" 'Running Recommended Tests for F/W Vendors'
 			done_tests_finish
 			;;
-- 
2.25.1




More information about the fwts-devel mailing list