Skip to content

Commit 2c32eae

Browse files
Jiaming LiCQ Bot
Jiaming Li
authored and
CQ Bot
committed
[bazel][test] Add all bazel tests to a bazel_test_package_group
This change will build all bazel test package in the same bazel_action. The individual `bazel_fuchsia_test_package` targets are not removed so developer can still choose to include specific test packages. Bug:391900225 Change-Id: Ib6f9a35ae232d2ab9441a20b0c41b5a69e54cee9 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1189193 Reviewed-by: David Turner <[email protected]> Commit-Queue: Jiaming Li <[email protected]>
1 parent 4bbe987 commit 2c32eae

File tree

16 files changed

+134
-125
lines changed

16 files changed

+134
-125
lines changed

‎build/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ group("non_hermetic_deps") {
170170
"//build/bazel/examples/*",
171171
"//build/bazel/tests/*",
172172
"//sdk/lib/driver/devicetree/*",
173+
"//src:*",
173174
"//src/devices/block/drivers/aml-sdmmc:*",
174175
"//src/devices/board/drivers/vim3-devicetree:*",
175176
"//src/devices/clock/drivers/vim3-clk:*",

‎build/bazel/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ group("bazel_action_allowlist") {
241241
"//examples/drivers/transport/driver/v2:parent_bazel_package.bazel_build",
242242
"//sdk/lib/driver/devicetree/examples/example-board:bazel_package.bazel_build",
243243
"//sdk/lib/driver/devicetree/examples/example-board:example-board-test-package.bazel_build",
244+
"//src:bazel_tests.bazel_build",
244245
"//src/connectivity/bluetooth/core/bt-host:bazel_test_pkg.bazel_build",
245246
"//src/connectivity/bluetooth/core/bt-host:bt-host.bazel_build",
246247
"//src/connectivity/bluetooth/core/bt-host/att:test_pkg.bazel_build",

‎src/BUILD.gn‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5+
import("//build/bazel/bazel_test_package_group.gni")
6+
57
group("tests") {
68
testonly = true
79
deps = [
@@ -16,6 +18,7 @@ group("tests_no_e2e") {
1618

1719
# Add the tests themselves
1820
deps = [
21+
":bazel_tests",
1922
"bringup:tests",
2023
"camera:tests",
2124
"chromium:tests",
@@ -51,6 +54,106 @@ group("tests_no_e2e") {
5154
]
5255
}
5356

57+
bazel_test_package_group("bazel_tests") {
58+
tests = [
59+
{
60+
test_package_target = "//src/devices/board/drivers/vim3-devicetree:vim3-devicetree-test-package"
61+
test_package_name = "vim3-devicetree-test"
62+
test_component_names = [ "vim3-devicetree-test" ]
63+
64+
# Integration test for the board driver requires these prebuilt artifacts:
65+
# - devicetree blob (.dtb)
66+
# - Platform bus driver (.far)
67+
# - driver-test-realm package (.far)
68+
deps = [
69+
"//sdk/lib/driver/devicetree/testing:devicetree-test-bazel-inputs",
70+
"//src/devices/board/drivers/vim3-devicetree:vim3-dtb",
71+
]
72+
},
73+
{
74+
test_package_target =
75+
"//src/devices/clock/drivers/vim3-clk:vim3-clk-test-package"
76+
test_package_name = "vim3-clk-test"
77+
test_component_names = [ "vim3-clk-test-bin" ]
78+
},
79+
{
80+
test_package_target =
81+
"//src/devices/gpio/drivers/aml-gpio:aml-gpio-test-package"
82+
test_package_name = "aml-gpio-test"
83+
test_component_names = [ "aml-gpio-test-bin" ]
84+
test_specs = {
85+
log_settings = {
86+
max_severity = "ERROR"
87+
}
88+
}
89+
},
90+
{
91+
test_package_target =
92+
"//src/devices/i2c/drivers/aml-i2c:aml-i2c-test-package"
93+
test_package_name = "aml-i2c-test"
94+
test_component_names = [ "aml-i2c-test-bin" ]
95+
test_specs = {
96+
log_settings = {
97+
max_severity = "ERROR"
98+
}
99+
}
100+
},
101+
{
102+
test_package_target =
103+
"//src/devices/usb/drivers/aml-usb-phy:aml-usb-phy-test-package"
104+
test_package_name = "aml-usb-phy-test"
105+
test_component_names = [ "aml-usb-phy-test-bin" ]
106+
test_specs = {
107+
log_settings = {
108+
max_severity = "ERROR"
109+
}
110+
}
111+
},
112+
{
113+
test_package_target =
114+
"//src/ui/input/drivers/adc-buttons:adc-buttons-test-package"
115+
test_package_name = "adc-buttons-test"
116+
test_component_names = [ "adc-buttons-test-bin" ]
117+
test_specs = {
118+
log_settings = {
119+
max_severity = "ERROR"
120+
}
121+
}
122+
},
123+
{
124+
test_package_target =
125+
"//src/media/audio/drivers/aml-g12-tdm:aml-g12-composite-test-package"
126+
test_package_name = "aml-g12-composite-test"
127+
test_component_names = [ "aml-g12-composite-test-bin" ]
128+
test_specs = {
129+
log_settings = {
130+
max_severity = "ERROR"
131+
}
132+
}
133+
},
134+
{
135+
test_package_target = "//src/devices/spmi/lib/hwreg-spmi:spmi-hwreg-test"
136+
test_package_name = "spmi-hwreg-test"
137+
test_component_names = [ "spmi-hwreg-test-bin" ]
138+
},
139+
{
140+
test_package_target = "//src/devices/usb/drivers/dwc3:dwc3-test-package"
141+
test_package_name = "dwc3-test"
142+
test_component_names = [ "dwc3-test-bin" ]
143+
test_specs = {
144+
log_settings = {
145+
max_severity = "ERROR"
146+
}
147+
}
148+
},
149+
{
150+
test_package_target =
151+
"//src/diagnostics/archivist/tests/pipeline_test:pipeline_test"
152+
test_component_names = [ "pipeline_test" ]
153+
},
154+
]
155+
}
156+
54157
group("e2e_tests") {
55158
testonly = true
56159
deps = [

‎src/devices/board/drivers/vim3-devicetree/BUILD.gn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import("//build/bind/bind.gni")
88
import("//build/devicetree/devicetree.gni")
99
import("//build/devicetree/devicetree_visitor.gni")
1010

11+
# Note: Don't add additional bazel tests into this group as it will introduce
12+
# more bazel actions into build graph. Instead, add them into
13+
# //src:bazel_tests
1114
group("tests") {
1215
testonly = true
13-
deps = [
14-
":vim3-devicetree-bind_test",
15-
":vim3-devicetree-test-package",
16-
]
16+
deps = [ ":vim3-devicetree-bind_test" ]
1717
}
1818

1919
devicetree_fragment("meson-g12-common") {

‎src/devices/clock/drivers/BUILD.gn‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ group("tests") {
66
testonly = true
77
deps = [ "clock:tests" ]
88
if (target_cpu == "arm64") {
9-
deps += [
10-
"amlogic-clk:tests",
11-
"vim3-clk:tests",
12-
]
9+
deps += [ "amlogic-clk:tests" ]
1310
}
1411
}

‎src/devices/clock/drivers/vim3-clk/BUILD.gn‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
group("tests") {
6-
testonly = true
7-
if (target_cpu == "arm64") {
8-
deps = [ ":vim3-clk-test-package" ]
9-
}
10-
}
11-
125
if (target_cpu == "arm64") {
136
import("//build/bazel/drivers/bazel_driver_package.gni")
147
import("//build/bazel/wrappers.gni")

‎src/devices/gpio/drivers/aml-gpio/BUILD.gn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ driver_bind_rules("aml-gpio-bind") {
5050
]
5151
}
5252

53+
# Note: Don't add additional bazel tests into this group as it will introduce
54+
# more bazel actions into build graph. Instead, add them into
55+
# //src:bazel_tests
5356
group("tests") {
5457
testonly = true
55-
deps = [
56-
":aml-gpio-bind_test",
57-
":aml-gpio-test-package",
58-
]
58+
deps = [ ":aml-gpio-bind_test" ]
5959
}

‎src/devices/i2c/drivers/aml-i2c/BUILD.gn‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ driver_bind_rules("aml_i2c_bind") {
1818
]
1919
}
2020

21+
# Note: Don't add additional bazel tests into this group as it will introduce
22+
# more bazel actions into build graph. Instead, add them into
23+
# //src:bazel_tests
2124
group("tests") {
2225
testonly = true
23-
deps = [
24-
":aml-i2c-test-package",
25-
":aml_i2c_bind_test",
26-
]
26+
deps = [ ":aml_i2c_bind_test" ]
2727
}
2828

2929
bazel_fuchsia_test_package("aml-i2c-test-package") {
3030
test_package_name = "aml-i2c-test"
3131
test_component_names = [ "aml-i2c-test-bin" ]
3232
test_specs = {
33-
environments = basic_envs
3433
log_settings = {
3534
max_severity = "ERROR"
3635
}

‎src/devices/spmi/BUILD.gn‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@
44

55
group("tests") {
66
testonly = true
7-
deps = [
8-
"bin:tests",
9-
"lib:tests",
10-
]
7+
deps = [ "bin:tests" ]
118
}

‎src/devices/spmi/lib/BUILD.gn‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)