Skip to content

Commit 23ea260

Browse files
committed
Added chip_link_tests to test_driver/efr32/args.gni and removed special logic from chip_test_suite
1 parent 6603bae commit 23ea260

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build/chip/chip_test_suite.gni

+2-5
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,12 @@ declare_args() {
4949
# ]
5050
# }
5151

52-
# If args.gni has defined an executable name, then ensure pw_test is called for each test source even if chip_link_tests is false.
53-
pw_test_builds_executable = test_executable_output_name != ""
54-
5552
#
5653
template("chip_test_suite") {
5754
_suite_name = target_name
5855

5956
exclude_variables = [ "tests" ]
60-
if (pw_test_builds_executable) {
57+
if (chip_link_tests) {
6158
# Common library shouldn't have all the individual unit tests, only the common sources.
6259
exclude_variables += [ "test_sources" ]
6360
} else {
@@ -97,7 +94,7 @@ template("chip_test_suite") {
9794
}
9895

9996
# Build a source_set or a flashable executable for each individual unit test source, which also includes the common files.
100-
if (chip_link_tests || pw_test_builds_executable) {
97+
if (chip_link_tests) {
10198
tests = []
10299

103100
if (defined(invoker.test_sources)) {

src/test_driver/efr32/args.gni

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2323

2424
chip_enable_pw_rpc = true
2525
chip_build_tests = true
26+
chip_link_tests = true
2627
chip_enable_openthread = true
2728
chip_openthread_ftd = false # use mtd as it is smaller.
2829

0 commit comments

Comments
 (0)