Creating new suites to run on variants
Created two suites 'control.wifi_matfunc_bcm4356' and
'control.wifi_matfunc_marvell8897' with suite dependency
as 'wifi:bcm4356' and 'wifi:marvell8897' respectively.
Also added these suites to individual matfunc tests controls.
BUG=chromium:440226
TEST=Ran few simple connect tests in wificell.
Change-Id: I326d1ce574e82897e42111d0c3b8f1cdc9cb3e6b
Reviewed-on: https://chromium-review.googlesource.com/235443
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Bindu Mahadev <bmahadev@chromium.org>
Commit-Queue: Bindu Mahadev <bmahadev@chromium.org>
Trybot-Ready: Bindu Mahadev <bmahadev@chromium.org>
diff --git a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
index 78ac3e9..43df5c0 100644
--- a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
+++ b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_BeaconInterval.wifi_bintval'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff b/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
index 23dc6de..ea1bdd4 100644
--- a/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
+++ b/server/site_tests/network_WiFi_BgscanBackoff/control.wifi_bgscan_backoff
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_BgscanBackoff.wifi_bgscan_backoff'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_CSADisconnect/control b/server/site_tests/network_WiFi_CSADisconnect/control
index b68ce48..7d593f3 100644
--- a/server/site_tests/network_WiFi_CSADisconnect/control
+++ b/server/site_tests/network_WiFi_CSADisconnect/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_CSADisconnect'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChannelScanDwellTime/control b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
index 0b1757b..2c65bf2 100644
--- a/server/site_tests/network_WiFi_ChannelScanDwellTime/control
+++ b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ChannelScanDwellTime'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
index 57b4553..ac051e0 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
@@ -6,7 +6,7 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.autoconnectWiFi'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
index 83bd7b9..f5e12e7 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
@@ -6,7 +6,8 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.enableDisableWiFi'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks b/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
index e5cc32e..5d3cb39 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
@@ -6,7 +6,8 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.findVerifyWiFiNetworks'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks b/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
index d70c4be..1f48d77 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
@@ -6,7 +6,8 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.transitionWiFiNetworks'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ConnectionIdentifier/control b/server/site_tests/network_WiFi_ConnectionIdentifier/control
index e0adfed..87bbd8f 100644
--- a/server/site_tests/network_WiFi_ConnectionIdentifier/control
+++ b/server/site_tests/network_WiFi_ConnectionIdentifier/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ConnectionIdentifier'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period b/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
index 9cce446..be953e6 100644
--- a/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
+++ b/server/site_tests/network_WiFi_DTIMPeriod/control.wifi_DTIM_period
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DTIMPeriod.wifi_DTIM_period'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisableEnable/control b/server/site_tests/network_WiFi_DisableEnable/control
index 2014cde..6a360f1 100644
--- a/server/site_tests/network_WiFi_DisableEnable/control
+++ b/server/site_tests/network_WiFi_DisableEnable/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisableEnable'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectClearsIP/control b/server/site_tests/network_WiFi_DisconnectClearsIP/control
index 21a211b..2876b51 100644
--- a/server/site_tests/network_WiFi_DisconnectClearsIP/control
+++ b/server/site_tests/network_WiFi_DisconnectClearsIP/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_DisconnectClearsIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_GTK/control b/server/site_tests/network_WiFi_GTK/control
index d739d4d..135b24f 100644
--- a/server/site_tests/network_WiFi_GTK/control
+++ b/server/site_tests/network_WiFi_GTK/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_GTK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenRemains/control b/server/site_tests/network_WiFi_HiddenRemains/control
index 26ba98d..9281491 100644
--- a/server/site_tests/network_WiFi_HiddenRemains/control
+++ b/server/site_tests/network_WiFi_HiddenRemains/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_HiddenRemains'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenScan/control b/server/site_tests/network_WiFi_HiddenScan/control
index 10b8739..e131bd5 100644
--- a/server/site_tests/network_WiFi_HiddenScan/control
+++ b/server/site_tests/network_WiFi_HiddenScan/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_HiddenScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS b/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
index 8543fb8..3069865 100644
--- a/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
+++ b/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_IBSS.wifi_IBSS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_LowInitialBitrates/control b/server/site_tests/network_WiFi_LowInitialBitrates/control
index 6134c11..f3beb87 100644
--- a/server/site_tests/network_WiFi_LowInitialBitrates/control
+++ b/server/site_tests/network_WiFi_LowInitialBitrates/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_LowInitialBitrates'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid b/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
index 32284f5..702b0b4 100644
--- a/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
+++ b/server/site_tests/network_WiFi_MaskedBSSID/control.wifi_masked_bssid
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MaskedBSSID.wifi_masked_bssid'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MissingBeacons/control b/server/site_tests/network_WiFi_MissingBeacons/control
index 6e2f048..788e75a 100644
--- a/server/site_tests/network_WiFi_MissingBeacons/control
+++ b/server/site_tests/network_WiFi_MissingBeacons/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MissingBeacons'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MultiAuth/control b/server/site_tests/network_WiFi_MultiAuth/control
index 87b4759..0841739 100644
--- a/server/site_tests/network_WiFi_MultiAuth/control
+++ b/server/site_tests/network_WiFi_MultiAuth/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_MultiAuth'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss b/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
index ccea8bf..fce966f 100644
--- a/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
+++ b/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_OverlappingBSSScan.wifi_obss'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PMKSACaching/control b/server/site_tests/network_WiFi_PMKSACaching/control
index 3cc7203..d5ed8b4 100644
--- a/server/site_tests/network_WiFi_PMKSACaching/control
+++ b/server/site_tests/network_WiFi_PMKSACaching/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_PMKSACaching'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PTK/control b/server/site_tests/network_WiFi_PTK/control
index 217406c..6829204 100644
--- a/server/site_tests/network_WiFi_PTK/control
+++ b/server/site_tests/network_WiFi_PTK/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_PTK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Powersave/control.wifi_ps b/server/site_tests/network_WiFi_Powersave/control.wifi_ps
index 5e43553..9ef350a 100644
--- a/server/site_tests/network_WiFi_Powersave/control.wifi_ps
+++ b/server/site_tests/network_WiFi_Powersave/control.wifi_ps
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Powersave.wifi_ps'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Prefer5Ghz/control b/server/site_tests/network_WiFi_Prefer5Ghz/control
index 7af926f..d6c8c0d 100644
--- a/server/site_tests/network_WiFi_Prefer5Ghz/control
+++ b/server/site_tests/network_WiFi_Prefer5Ghz/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Prefer5Ghz'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileBasic/control b/server/site_tests/network_WiFi_ProfileBasic/control
index 4eb5243..4c11232 100644
--- a/server/site_tests/network_WiFi_ProfileBasic/control
+++ b/server/site_tests/network_WiFi_ProfileBasic/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ProfileBasic'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileGUID/control b/server/site_tests/network_WiFi_ProfileGUID/control
index 83ff227..fe73b98 100644
--- a/server/site_tests/network_WiFi_ProfileGUID/control
+++ b/server/site_tests/network_WiFi_ProfileGUID/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ProfileGUID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RateControl/control b/server/site_tests/network_WiFi_RateControl/control
index c7dfb2a..34943b1 100644
--- a/server/site_tests/network_WiFi_RateControl/control
+++ b/server/site_tests/network_WiFi_RateControl/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_RateControl'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Reassociate/control b/server/site_tests/network_WiFi_Reassociate/control
index f0e6952..9f71983 100644
--- a/server/site_tests/network_WiFi_Reassociate/control
+++ b/server/site_tests/network_WiFi_Reassociate/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Reassociate'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Regulatory/control b/server/site_tests/network_WiFi_Regulatory/control
index 6f0f4f1..f626306 100644
--- a/server/site_tests/network_WiFi_Regulatory/control
+++ b/server/site_tests/network_WiFi_Regulatory/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Regulatory'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
index ad063ea..2376ba7 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roam1xTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamNone b/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
index 3cd7b5e..75a99b0 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamNone'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP b/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
index 46db137..0a646bb 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamWEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA b/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
index b4e9729..b8085b4 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_Roam.wifi_roamWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag b/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
index 4130e6e..c52c8e5 100644
--- a/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
+++ b/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_RxFrag.wifi_rxfrag'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ScanPerformance/control b/server/site_tests/network_WiFi_ScanPerformance/control
index 501ab72..2040cfb 100644
--- a/server/site_tests/network_WiFi_ScanPerformance/control
+++ b/server/site_tests/network_WiFi_ScanPerformance/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_ScanPerformance'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SecChange/control b/server/site_tests/network_WiFi_SecChange/control
index 1facb06..f6fb18b 100644
--- a/server/site_tests/network_WiFi_SecChange/control
+++ b/server/site_tests/network_WiFi_SecChange/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_SecChange'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
index 5d6f223..76a2c49 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11a'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
index 66ceba1..cb10a38 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11b'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
index c5f6df1..c8ad8e4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check11g'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
index 92a0a26..07c2e80 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_PEAP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
index a5bd339..bd3689c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_TTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
index 9790c77..5194079 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
index f91e197..765e18a 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
index 2639583..2e69056 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
index e1ec5e4..661e1b2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check24HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
index 2c37f7d..363c769 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT20'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
index cf66d79..6f62869 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5HT40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
index 2b5d6f3..9bba3f4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_check5VHT80'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
index 1d05058..95b2964 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkDFS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
index d5829c2..1a3e963 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHidden'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
index 2f64fb0..6238f04 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
index fc01ebb..87b6889 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkMixedWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
index decd6ae..b554e2b 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkNonAsciiSSID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
index 9f17703..a037124 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkOddWPAPassphrases'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
index 8ccafe6..7147d20 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkRawPMK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
index 21fd78d..7634803 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkSSIDLimits'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
index 11af821..791e540 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkTruncatedBeacon'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
index d3b1ca7..51572d4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP104'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
index 050298b..fcc7bc7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP40'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
index 923e7b4..23e7637 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
index dca1bc9..4592f3e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_CCMP_PMF'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
index 404b884..e3067f2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
index 2e2406a..903b4db 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_CCMP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
index 6cf470a..ca6bd6c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_TKIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
index db2d8ec..1f117b8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_multi'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_correctness_cros_core, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_correctness_cros_core, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SuspendTwice/control b/server/site_tests/network_WiFi_SuspendTwice/control
index 6a80889..e40d6c6 100644
--- a/server/site_tests/network_WiFi_SuspendTwice/control
+++ b/server/site_tests/network_WiFi_SuspendTwice/control
@@ -7,8 +7,8 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
# TODO(wiley) When we have servos on our test machines, put this in
-# wifi_matfunc, wifi_matfunc_preflight. Currently, it kills to many
-# device on broken suspends.
+# wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897.
+# Currently, it kills to many device on broken suspends.
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_TDLSPing/control b/server/site_tests/network_WiFi_TDLSPing/control
index f618343..63555e3 100644
--- a/server/site_tests/network_WiFi_TDLSPing/control
+++ b/server/site_tests/network_WiFi_TDLSPing/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_TDLSPing'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_UpdateRouter/control b/server/site_tests/network_WiFi_UpdateRouter/control
index 0e3b08c..bc63f69 100644
--- a/server/site_tests/network_WiFi_UpdateRouter/control
+++ b/server/site_tests/network_WiFi_UpdateRouter/control
@@ -7,7 +7,8 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight, wifi_release, wifi_perf'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_release, wifi_perf')
DOC = """
This test updates the router in a WiFi cell to the latest stable version.
diff --git a/server/site_tests/network_WiFi_VerifyRouter/control b/server/site_tests/network_WiFi_VerifyRouter/control
index 7bed00a..5a869d4 100644
--- a/server/site_tests/network_WiFi_VerifyRouter/control
+++ b/server/site_tests/network_WiFi_VerifyRouter/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_VerifyRouter'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_VisibleScan/control b/server/site_tests/network_WiFi_VisibleScan/control
index 01085db..e0a0d56 100644
--- a/server/site_tests/network_WiFi_VisibleScan/control
+++ b/server/site_tests/network_WiFi_VisibleScan/control
@@ -6,7 +6,7 @@
NAME = 'network_WiFi_VisibleScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_preflight'
+SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 9ef7a8e..374c569 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -258,9 +258,15 @@
branch_specs: ==tot
pool: wificell
-[WiFi_MatFuncDaily_Preflight]
+[WiFi_MatFuncDaily_bcm4356]
run_on: nightly
-suite: wifi_matfunc_preflight
+suite: wifi_matfunc_bcm4356
+branch_specs: ==tot
+pool: wificell_preflight
+
+[WiFi_MatFuncDaily_marvell8897]
+run_on: nightly
+suite: wifi_matfunc_marvell8897
branch_specs: ==tot
pool: wificell_preflight
@@ -640,12 +646,6 @@
branch_specs: >=tot-2
pool: wificell
-[WeeklyWiFi_MatFuncDaily_Preflight]
-run_on: weekly
-suite: wifi_matfunc_preflight
-branch_specs: >=R40
-pool: wificell_preflight
-
[WeeklyWiFi_MatFunc_Weekly]
run_on: weekly
suite: wifi_matfunc
diff --git a/test_suites/control.wifi_matfunc_bcm4356 b/test_suites/control.wifi_matfunc_bcm4356
new file mode 100644
index 0000000..9eba8f1
--- /dev/null
+++ b/test_suites/control.wifi_matfunc_bcm4356
@@ -0,0 +1,39 @@
+# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "wiley@chromium.org, bmahadev@chromium.org"
+NAME = "wifi_matfunc_bcm4356"
+PURPOSE = "Verify basic WiFi functionality."
+CRITERIA = "All tests with SUITE=wifi_matfunc_bcm4356 must pass."
+
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This is an example of a dynamic test suite.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
+ suite_dependencies='wifi:bcm4356', wait_for_results=wait_for_results)
diff --git a/test_suites/control.wifi_matfunc_marvell8897 b/test_suites/control.wifi_matfunc_marvell8897
new file mode 100644
index 0000000..ae30006
--- /dev/null
+++ b/test_suites/control.wifi_matfunc_marvell8897
@@ -0,0 +1,39 @@
+# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "wiley@chromium.org, bmahadev@chromium.org"
+NAME = "wifi_matfunc_marvell8897"
+PURPOSE = "Verify basic WiFi functionality."
+CRITERIA = "All tests with SUITE=wifi_matfunc_marvell8897 must pass."
+
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+This is an example of a dynamic test suite.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name=NAME, job=job, pool=pool,
+ check_hosts=check_hosts, add_experimental=True, num=num,
+ file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+ max_runtime_mins=60, devserver_url=devserver_url,
+ version_prefix=provision.CROS_VERSION_PREFIX, job_retry=job_retry,
+ suite_dependencies='wifi:marvell8897', wait_for_results=wait_for_results)