Creating new suite to run matfunc on Intel stone peak 7265
BUG=chromium:450462
TEST=None
Change-Id: I25176750bb07934ce03f5f8fc19ccf5981a2c2d1
Reviewed-on: https://chromium-review.googlesource.com/243385
Reviewed-by: Kris Rambish <krisr@chromium.org>
Tested-by: Bindu Mahadev <bmahadev@chromium.org>
Reviewed-by: 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 43df5c0..65701c9 100644
--- a/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
+++ b/server/site_tests/network_WiFi_BeaconInterval/control.wifi_bintval
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_BeaconInterval.wifi_bintval'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 ea1bdd4..f03e5e3 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,8 @@
NAME = 'network_WiFi_BgscanBackoff.wifi_bgscan_backoff'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_CSADisconnect/control b/server/site_tests/network_WiFi_CSADisconnect/control
index 7d593f3..195464b 100644
--- a/server/site_tests/network_WiFi_CSADisconnect/control
+++ b/server/site_tests/network_WiFi_CSADisconnect/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_CSADisconnect'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChannelScanDwellTime/control b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
index 2c65bf2..5e009cd 100644
--- a/server/site_tests/network_WiFi_ChannelScanDwellTime/control
+++ b/server/site_tests/network_WiFi_ChannelScanDwellTime/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ChannelScanDwellTime'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
index ac051e0..5575119 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.autoconnectWiFi
@@ -6,7 +6,8 @@
TIME = 'SHORT'
NAME = 'network_WiFi_ChromeEndToEnd.autoconnectWiFi'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
index f5e12e7..af7b25a 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.enableDisableWiFi
@@ -7,7 +7,7 @@
NAME = 'network_WiFi_ChromeEndToEnd.enableDisableWiFi'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 5d3cb39..cbf70e0 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.findVerifyWiFiNetworks
@@ -7,7 +7,7 @@
NAME = 'network_WiFi_ChromeEndToEnd.findVerifyWiFiNetworks'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 1f48d77..83169af 100644
--- a/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
+++ b/server/site_tests/network_WiFi_ChromeEndToEnd/control.transitionWiFiNetworks
@@ -7,7 +7,7 @@
NAME = 'network_WiFi_ChromeEndToEnd.transitionWiFiNetworks'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, wifi_release')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ConnectionIdentifier/control b/server/site_tests/network_WiFi_ConnectionIdentifier/control
index 87bbd8f..735390c 100644
--- a/server/site_tests/network_WiFi_ConnectionIdentifier/control
+++ b/server/site_tests/network_WiFi_ConnectionIdentifier/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ConnectionIdentifier'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 be953e6..939d42f 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,8 @@
NAME = 'network_WiFi_DTIMPeriod.wifi_DTIM_period'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisableEnable/control b/server/site_tests/network_WiFi_DisableEnable/control
index 6a360f1..29fef25 100644
--- a/server/site_tests/network_WiFi_DisableEnable/control
+++ b/server/site_tests/network_WiFi_DisableEnable/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_DisableEnable'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_DisconnectClearsIP/control b/server/site_tests/network_WiFi_DisconnectClearsIP/control
index 2876b51..a29063f 100644
--- a/server/site_tests/network_WiFi_DisconnectClearsIP/control
+++ b/server/site_tests/network_WiFi_DisconnectClearsIP/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_DisconnectClearsIP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_GTK/control b/server/site_tests/network_WiFi_GTK/control
index 135b24f..6ff0e13 100644
--- a/server/site_tests/network_WiFi_GTK/control
+++ b/server/site_tests/network_WiFi_GTK/control
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core')
+ 'wifi_matfunc_intel7265, 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 9281491..b25d29e 100644
--- a/server/site_tests/network_WiFi_HiddenRemains/control
+++ b/server/site_tests/network_WiFi_HiddenRemains/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_HiddenRemains'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_HiddenScan/control b/server/site_tests/network_WiFi_HiddenScan/control
index e131bd5..4838b18 100644
--- a/server/site_tests/network_WiFi_HiddenScan/control
+++ b/server/site_tests/network_WiFi_HiddenScan/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_HiddenScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 3069865..1eee305 100644
--- a/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
+++ b/server/site_tests/network_WiFi_IBSS/control.wifi_IBSS
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_IBSS.wifi_IBSS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_LowInitialBitrates/control b/server/site_tests/network_WiFi_LowInitialBitrates/control
index f3beb87..64f9257 100644
--- a/server/site_tests/network_WiFi_LowInitialBitrates/control
+++ b/server/site_tests/network_WiFi_LowInitialBitrates/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_LowInitialBitrates'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 702b0b4..209d992 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,8 @@
NAME = 'network_WiFi_MaskedBSSID.wifi_masked_bssid'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MissingBeacons/control b/server/site_tests/network_WiFi_MissingBeacons/control
index 788e75a..ab0167d 100644
--- a/server/site_tests/network_WiFi_MissingBeacons/control
+++ b/server/site_tests/network_WiFi_MissingBeacons/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_MissingBeacons'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_MultiAuth/control b/server/site_tests/network_WiFi_MultiAuth/control
index 0841739..d6ed7c2 100644
--- a/server/site_tests/network_WiFi_MultiAuth/control
+++ b/server/site_tests/network_WiFi_MultiAuth/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_MultiAuth'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 fce966f..045f4d3 100644
--- a/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
+++ b/server/site_tests/network_WiFi_OverlappingBSSScan/control.wifi_obss
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_OverlappingBSSScan.wifi_obss'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PMKSACaching/control b/server/site_tests/network_WiFi_PMKSACaching/control
index d5ed8b4..c9bc462 100644
--- a/server/site_tests/network_WiFi_PMKSACaching/control
+++ b/server/site_tests/network_WiFi_PMKSACaching/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_PMKSACaching'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_PTK/control b/server/site_tests/network_WiFi_PTK/control
index 6829204..862b4a0 100644
--- a/server/site_tests/network_WiFi_PTK/control
+++ b/server/site_tests/network_WiFi_PTK/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_PTK'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 9ef350a..81e8474 100644
--- a/server/site_tests/network_WiFi_Powersave/control.wifi_ps
+++ b/server/site_tests/network_WiFi_Powersave/control.wifi_ps
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Powersave.wifi_ps'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Prefer5Ghz/control b/server/site_tests/network_WiFi_Prefer5Ghz/control
index d6c8c0d..8ebf426 100644
--- a/server/site_tests/network_WiFi_Prefer5Ghz/control
+++ b/server/site_tests/network_WiFi_Prefer5Ghz/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Prefer5Ghz'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileBasic/control b/server/site_tests/network_WiFi_ProfileBasic/control
index 4c11232..c1e9944 100644
--- a/server/site_tests/network_WiFi_ProfileBasic/control
+++ b/server/site_tests/network_WiFi_ProfileBasic/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ProfileBasic'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ProfileGUID/control b/server/site_tests/network_WiFi_ProfileGUID/control
index fe73b98..4989e14 100644
--- a/server/site_tests/network_WiFi_ProfileGUID/control
+++ b/server/site_tests/network_WiFi_ProfileGUID/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ProfileGUID'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RateControl/control b/server/site_tests/network_WiFi_RateControl/control
index 34943b1..ac677b2 100644
--- a/server/site_tests/network_WiFi_RateControl/control
+++ b/server/site_tests/network_WiFi_RateControl/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_RateControl'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Reassociate/control b/server/site_tests/network_WiFi_Reassociate/control
index 9f71983..57ac039 100644
--- a/server/site_tests/network_WiFi_Reassociate/control
+++ b/server/site_tests/network_WiFi_Reassociate/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Reassociate'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_Regulatory/control b/server/site_tests/network_WiFi_Regulatory/control
index f626306..56c61ae 100644
--- a/server/site_tests/network_WiFi_Regulatory/control
+++ b/server/site_tests/network_WiFi_Regulatory/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Regulatory'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 2376ba7..71b0805 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roam1xTLS
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Roam.wifi_roam1xTLS'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 75a99b0..d4a1792 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamNone
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Roam.wifi_roamNone'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 0a646bb..e06460b 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWEP
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Roam.wifi_roamWEP'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 b8085b4..1a36342 100644
--- a/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
+++ b/server/site_tests/network_WiFi_Roam/control.wifi_roamWPA
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_Roam.wifi_roamWPA'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_RoamEndToEnd/control b/server/site_tests/network_WiFi_RoamEndToEnd/control
index 594e66b..a83b93b 100755
--- a/server/site_tests/network_WiFi_RoamEndToEnd/control
+++ b/server/site_tests/network_WiFi_RoamEndToEnd/control
@@ -6,7 +6,8 @@
TIME = 'SHORT'
NAME = 'network_WiFi_RoamEndToEnd'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_release'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265, wifi_release')
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 c52c8e5..75f1238 100644
--- a/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
+++ b/server/site_tests/network_WiFi_RxFrag/control.wifi_rxfrag
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_RxFrag.wifi_rxfrag'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_ScanPerformance/control b/server/site_tests/network_WiFi_ScanPerformance/control
index 2040cfb..cbf84c9 100644
--- a/server/site_tests/network_WiFi_ScanPerformance/control
+++ b/server/site_tests/network_WiFi_ScanPerformance/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_ScanPerformance'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_SecChange/control b/server/site_tests/network_WiFi_SecChange/control
index f6fb18b..65e41f8 100644
--- a/server/site_tests/network_WiFi_SecChange/control
+++ b/server/site_tests/network_WiFi_SecChange/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_SecChange'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
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 76a2c49..100e343 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 cb10a38..73c7e2f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 c8ad8e4..f21e559 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 07c2e80..10b0e67 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 bd3689c..3a18f3a 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 5194079..27757c2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 765e18a..74fc6e9 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 2e69056..d2047bb 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 661e1b2..dba77ac 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 363c769..4be9e1d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 6f62869..aa245cb 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 9bba3f4..a7e9d50 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 95b2964..75a51db 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 1a3e963..60e50c7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 6238f04..9f3956f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 87b6889..d7693b3 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 b554e2b..8a43de6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 a037124..9318ef4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 7147d20..fa6fd05 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 7634803..4084314 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 51572d4..1f5749d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 fcc7bc7..5a56741 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 23e7637..9ae6c97 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 4592f3e..f9679ac 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release')
+ 'wifi_matfunc_intel7265, 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 e3067f2..cfb0886 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 903b4db..21d2663 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 ca6bd6c..5772722 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 1f117b8..71b09b7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -7,7 +7,7 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_correctness_cros_core, wifi_release')
+ 'wifi_matfunc_intel7265, 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 e40d6c6..3d261d6 100644
--- a/server/site_tests/network_WiFi_SuspendTwice/control
+++ b/server/site_tests/network_WiFi_SuspendTwice/control
@@ -7,7 +7,8 @@
TIME = 'SHORT'
TEST_TYPE = 'Server'
# TODO(wiley) When we have servos on our test machines, put this in
-# wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897.
+# wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,
+# wifi_matfunc_intel7265.
# Currently, it kills to many device on broken suspends.
DEPENDENCIES = 'wificell'
diff --git a/server/site_tests/network_WiFi_TDLSPing/control b/server/site_tests/network_WiFi_TDLSPing/control
index 63555e3..6e5773f 100644
--- a/server/site_tests/network_WiFi_TDLSPing/control
+++ b/server/site_tests/network_WiFi_TDLSPing/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_TDLSPing'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_UpdateRouter/control b/server/site_tests/network_WiFi_UpdateRouter/control
index bc63f69..24f6488 100644
--- a/server/site_tests/network_WiFi_UpdateRouter/control
+++ b/server/site_tests/network_WiFi_UpdateRouter/control
@@ -8,7 +8,7 @@
TEST_TYPE = 'Server'
DEPENDENCIES = 'wificell'
SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
- 'wifi_release, wifi_perf')
+ 'wifi_matfunc_intel7265')
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 5a869d4..133656a 100644
--- a/server/site_tests/network_WiFi_VerifyRouter/control
+++ b/server/site_tests/network_WiFi_VerifyRouter/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_VerifyRouter'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/network_WiFi_VisibleScan/control b/server/site_tests/network_WiFi_VisibleScan/control
index e0a0d56..f5a0b9f 100644
--- a/server/site_tests/network_WiFi_VisibleScan/control
+++ b/server/site_tests/network_WiFi_VisibleScan/control
@@ -6,7 +6,8 @@
NAME = 'network_WiFi_VisibleScan'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897'
+SUITE = ('wifi_matfunc, wifi_matfunc_bcm4356, wifi_matfunc_marvell8897,'
+ 'wifi_matfunc_intel7265')
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index 6ac9e53..a6f4b71 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -259,6 +259,12 @@
branch_specs: >=tot-1
pool: wificell
+[WiFi_MatFuncDaily_intel7265]
+run_on: nightly
+suite: wifi_matfunc_intel7265]
+branch_specs: >=tot-1
+pool: wificell_preflight
+
[WiFi_MatFuncDaily_bcm4356]
run_on: nightly
suite: wifi_matfunc_bcm4356
diff --git a/test_suites/control.wifi_matfunc_intel7265 b/test_suites/control.wifi_matfunc_intel7265
new file mode 100644
index 0000000..5f2834c
--- /dev/null
+++ b/test_suites/control.wifi_matfunc_intel7265
@@ -0,0 +1,40 @@
+# 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_intel7265"
+PURPOSE = "Verify basic WiFi functionality."
+CRITERIA = "All tests with SUITE=wifi_matfunc_intel 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,
+ max_retries=max_retries, suite_dependencies='wifi:intel7265',
+ wait_for_results=wait_for_results)