[wlan][tests] Componentize more wlan tests
CF-789
Change-Id: I129a8ab17e10c53013bbab0a33e1fcacff2874e2
diff --git a/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/BUILD.gn b/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/BUILD.gn
index 5303037..91d307e 100644
--- a/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/BUILD.gn
+++ b/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
rustc_library("wlan-bitfield-wrapper") {
name = "wlan-bitfield-wrapper"
@@ -17,9 +18,7 @@
]
}
-package("wlan-bitfield-tests") {
- testonly = true
-
+test_package("wlan-bitfield-tests") {
deps = [
":wlan-bitfield-wrapper",
]
diff --git a/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/meta/wlan_bitfield_wrapper_lib_test.cmx b/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/meta/wlan_bitfield_wrapper_lib_test.cmx
new file mode 100644
index 0000000..825f797
--- /dev/null
+++ b/src/connectivity/wlan/lib/bitfield/wlan-bitfield-tests/meta/wlan_bitfield_wrapper_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_bitfield_wrapper_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/lib/common/rust/BUILD.gn b/src/connectivity/wlan/lib/common/rust/BUILD.gn
index a76ebf2..eeab167 100644
--- a/src/connectivity/wlan/lib/common/rust/BUILD.gn
+++ b/src/connectivity/wlan/lib/common/rust/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_library("wlan-common") {
@@ -28,9 +29,7 @@
]
}
-package("wlan-common-tests") {
- testonly = true
-
+test_package("wlan-common-tests") {
deps = [
":wlan-common",
]
diff --git a/src/connectivity/wlan/lib/common/rust/meta/wlan_common_lib_test.cmx b/src/connectivity/wlan/lib/common/rust/meta/wlan_common_lib_test.cmx
new file mode 100644
index 0000000..e2810ed
--- /dev/null
+++ b/src/connectivity/wlan/lib/common/rust/meta/wlan_common_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_common_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/lib/inspect/BUILD.gn b/src/connectivity/wlan/lib/inspect/BUILD.gn
index ec09a25..c032eba 100644
--- a/src/connectivity/wlan/lib/inspect/BUILD.gn
+++ b/src/connectivity/wlan/lib/inspect/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_library("wlan-inspect") {
@@ -22,9 +23,7 @@
]
}
-package("wlan-inspect-tests") {
- testonly = true
-
+test_package("wlan-inspect-tests") {
deps = [
":wlan-inspect",
]
diff --git a/src/connectivity/wlan/lib/inspect/meta/wlan_inspect_lib_test.cmx b/src/connectivity/wlan/lib/inspect/meta/wlan_inspect_lib_test.cmx
new file mode 100644
index 0000000..6bb368d
--- /dev/null
+++ b/src/connectivity/wlan/lib/inspect/meta/wlan_inspect_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_inspect_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/lib/mlme/rust/BUILD.gn b/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
index 2a29ad3..a3599e0 100644
--- a/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
+++ b/src/connectivity/wlan/lib/mlme/rust/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_library("wlan-mlme") {
@@ -20,9 +21,7 @@
]
}
-package("wlan-mlme-tests") {
- testonly = true
-
+test_package("wlan-mlme-tests") {
deps = [
":wlan-mlme",
]
diff --git a/src/connectivity/wlan/lib/mlme/rust/meta/wlan_mlme_lib_test.cmx b/src/connectivity/wlan/lib/mlme/rust/meta/wlan_mlme_lib_test.cmx
new file mode 100644
index 0000000..279d44b
--- /dev/null
+++ b/src/connectivity/wlan/lib/mlme/rust/meta/wlan_mlme_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_mlme_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/lib/rsn/BUILD.gn b/src/connectivity/wlan/lib/rsn/BUILD.gn
index 11e327f..d601b3e 100644
--- a/src/connectivity/wlan/lib/rsn/BUILD.gn
+++ b/src/connectivity/wlan/lib/rsn/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_library("wlan-rsn") {
@@ -31,9 +32,7 @@
]
}
-package("wlan-rsn-tests") {
- testonly = true
-
+test_package("wlan-rsn-tests") {
deps = [
":wlan-rsn",
]
diff --git a/src/connectivity/wlan/lib/rsn/meta/wlan_rsn_lib_test.cmx b/src/connectivity/wlan/lib/rsn/meta/wlan_rsn_lib_test.cmx
new file mode 100644
index 0000000..724d08f
--- /dev/null
+++ b/src/connectivity/wlan/lib/rsn/meta/wlan_rsn_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_rsn_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/lib/sme/BUILD.gn b/src/connectivity/wlan/lib/sme/BUILD.gn
index 8c2fd38..874f649 100644
--- a/src/connectivity/wlan/lib/sme/BUILD.gn
+++ b/src/connectivity/wlan/lib/sme/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_library.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_library("wlan-sme") {
@@ -35,9 +36,7 @@
]
}
-package("wlan-sme-tests") {
- testonly = true
-
+test_package("wlan-sme-tests") {
deps = [
":wlan-sme",
]
diff --git a/src/connectivity/wlan/lib/sme/meta/wlan_sme_lib_test.cmx b/src/connectivity/wlan/lib/sme/meta/wlan_sme_lib_test.cmx
new file mode 100644
index 0000000..acbdfc0
--- /dev/null
+++ b/src/connectivity/wlan/lib/sme/meta/wlan_sme_lib_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_sme_lib_test"
+ }
+}
diff --git a/src/connectivity/wlan/tools/wlantool/BUILD.gn b/src/connectivity/wlan/tools/wlantool/BUILD.gn
index e620aee..0e0e644 100644
--- a/src/connectivity/wlan/tools/wlantool/BUILD.gn
+++ b/src/connectivity/wlan/tools/wlantool/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/package.gni")
import("//build/rust/rustc_binary.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
rustc_binary("bin") {
@@ -45,9 +46,7 @@
]
}
-package("wlan-tests") {
- testonly = true
-
+test_package("wlan-tests") {
deps = [
":bin",
]
@@ -58,4 +57,4 @@
environments = basic_envs
},
]
-}
\ No newline at end of file
+}
diff --git a/src/connectivity/wlan/tools/wlantool/meta/wlan_bin_test.cmx b/src/connectivity/wlan/tools/wlantool/meta/wlan_bin_test.cmx
new file mode 100644
index 0000000..6801805
--- /dev/null
+++ b/src/connectivity/wlan/tools/wlantool/meta/wlan_bin_test.cmx
@@ -0,0 +1,5 @@
+{
+ "program": {
+ "binary": "test/wlan_bin_test"
+ }
+}
diff --git a/src/connectivity/wlan/wlancfg/BUILD.gn b/src/connectivity/wlan/wlancfg/BUILD.gn
index 92bb3fc..c58813b 100644
--- a/src/connectivity/wlan/wlancfg/BUILD.gn
+++ b/src/connectivity/wlan/wlancfg/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config.gni")
import("//build/package.gni")
import("//build/rust/rustc_binary.gni")
+import("//build/test/test_package.gni")
import("//build/testing/environments.gni")
declare_args() {
@@ -86,8 +87,7 @@
}
}
-package("wlancfg-tests") {
- testonly = true
+test_package("wlancfg-tests") {
deps = [
":bin",
]
diff --git a/src/connectivity/wlan/wlancfg/meta/wlancfg_bin_test.cmx b/src/connectivity/wlan/wlancfg/meta/wlancfg_bin_test.cmx
new file mode 100644
index 0000000..b270f3a4
--- /dev/null
+++ b/src/connectivity/wlan/wlancfg/meta/wlancfg_bin_test.cmx
@@ -0,0 +1,10 @@
+{
+ "program": {
+ "binary": "test/wlancfg_bin_test"
+ },
+ "sandbox": {
+ "features": [
+ "system-temp"
+ ]
+ }
+}
