Skip to content

Commit 4676d27

Browse files
jlatusekjlatusek
authored
Remove dependency between chip-tool and the nlunit-test (project-chip#31234)
* Remove dependency between chip-tool and tests * Remove static lib complete * Replace source_set to static_library
1 parent 809c5e6 commit 4676d27

File tree

38 files changed

+57
-40
lines changed

38 files changed

+57
-40
lines changed

‎examples/placeholder/linux/BUILD.gn

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ executable("chip-${chip_tests_zap_config}") {
4444
"${chip_root}/src/app/tests/suites/credentials:dac_provider",
4545
"${chip_root}/src/app/tests/suites/pics",
4646
"${chip_root}/src/lib",
47-
"${chip_root}/src/lib/support:testing", # For sleepMillis. TODO: this is
48-
# odd and should be fixed
47+
"${chip_root}/src/lib/support:test_utils",
4948
"${chip_root}/src/platform/logging:headers",
5049
"${chip_root}/third_party/jsoncpp",
5150
]

‎src/access/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ chip_test_suite_using_nltest("tests") {
2727

2828
public_deps = [
2929
"${chip_root}/src/access",
30-
"${chip_root}/src/lib/support:testing",
30+
"${chip_root}/src/lib/support:test_utils",
31+
"${chip_root}/src/lib/support:testing_nlunit",
3132
"${nlunit_test_root}:nlunit-test",
3233
]
3334
}

‎src/app/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ chip_test_suite_using_nltest("tests") {
206206
"${chip_root}/src/app/tests:helpers",
207207
"${chip_root}/src/app/util/mock:mock_ember",
208208
"${chip_root}/src/lib/core",
209-
"${chip_root}/src/lib/support:testing",
209+
"${chip_root}/src/lib/support:test_utils",
210+
"${chip_root}/src/lib/support:testing_nlunit",
210211
"${nlunit_test_root}:nlunit-test",
211212
]
212213

‎src/app/tests/suites/commands/interaction_model/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ static_library("interaction_model") {
2828
public_deps = [
2929
"${chip_root}/src/app",
3030
"${chip_root}/src/lib/support",
31-
"${chip_root}/src/lib/support:testing",
31+
"${chip_root}/src/lib/support:test_utils",
3232
]
3333
}

‎src/app/util/mock/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ source_set("mock_ember") {
2828
"${chip_root}/src/app",
2929
"${chip_root}/src/lib/core",
3030
"${chip_root}/src/lib/support",
31-
"${chip_root}/src/lib/support:testing",
31+
"${chip_root}/src/lib/support:testing_nlunit",
3232
]
3333

3434
public_configs = [ ":mock_include" ]

‎src/ble/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ chip_test_suite_using_nltest("tests") {
3030

3131
public_deps = [
3232
"${chip_root}/src/ble",
33-
"${chip_root}/src/lib/support:testing",
33+
"${chip_root}/src/lib/support:testing_nlunit",
3434
"${nlunit_test_root}:nlunit-test",
3535
]
3636
}

‎src/controller/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ chip_test_suite_using_nltest("tests") {
3939
"${chip_root}/src/app/common:cluster-objects",
4040
"${chip_root}/src/app/tests:helpers",
4141
"${chip_root}/src/controller",
42-
"${chip_root}/src/lib/support:testing",
42+
"${chip_root}/src/lib/support:test_utils",
43+
"${chip_root}/src/lib/support:testing_nlunit",
4344
"${chip_root}/src/messaging/tests:helpers",
4445
"${chip_root}/src/transport/raw/tests:helpers",
4546
"${nlunit_test_root}:nlunit-test",

‎src/controller/tests/data_model/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ chip_test_suite_using_nltest("data_model") {
3434
"${chip_root}/src/app/common:cluster-objects",
3535
"${chip_root}/src/app/tests:helpers",
3636
"${chip_root}/src/app/util/mock:mock_ember",
37-
"${chip_root}/src/lib/support:testing",
37+
"${chip_root}/src/lib/support:testing_nlunit",
3838
"${chip_root}/src/messaging/tests:helpers",
3939
"${chip_root}/src/transport/raw/tests:helpers",
4040
"${nlunit_test_root}:nlunit-test",

‎src/credentials/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ chip_test_suite_using_nltest("tests") {
7070
"${chip_root}/src/credentials",
7171
"${chip_root}/src/credentials:default_attestation_verifier",
7272
"${chip_root}/src/lib/core",
73-
"${chip_root}/src/lib/support:testing",
73+
"${chip_root}/src/lib/support:testing_nlunit",
7474
"${nlunit_test_root}:nlunit-test",
7575
]
7676
}

‎src/crypto/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ chip_test_suite_using_nltest("tests") {
6969
"${chip_root}/src/credentials/tests:cert_test_vectors",
7070
"${chip_root}/src/crypto",
7171
"${chip_root}/src/lib/core",
72-
"${chip_root}/src/lib/support:testing",
72+
"${chip_root}/src/lib/support:testing_nlunit",
7373
"${chip_root}/src/platform",
7474
"${nlunit_test_root}:nlunit-test",
7575
]

‎src/inet/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ chip_test_suite_using_nltest("tests") {
6868
":helpers",
6969
"${chip_root}/src/inet",
7070
"${chip_root}/src/lib/core",
71-
"${chip_root}/src/lib/support:testing",
71+
"${chip_root}/src/lib/support:testing_nlunit",
7272
"${nlunit_test_root}:nlunit-test",
7373
]
7474

‎src/lib/address_resolve/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ chip_test_suite_using_nltest("tests") {
2929

3030
public_deps = [
3131
"${chip_root}/src/lib/address_resolve",
32-
"${chip_root}/src/lib/support:testing",
32+
"${chip_root}/src/lib/support:testing_nlunit",
3333
"${chip_root}/src/protocols",
3434
"${nlunit_test_root}:nlunit-test",
3535
]

‎src/lib/asn1/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_test_suite_using_nltest("tests") {
2626
public_deps = [
2727
"${chip_root}/src/lib/asn1",
2828
"${chip_root}/src/lib/core",
29-
"${chip_root}/src/lib/support:testing",
29+
"${chip_root}/src/lib/support:testing_nlunit",
3030
"${chip_root}/src/platform",
3131
"${nlunit_test_root}:nlunit-test",
3232
]

‎src/lib/core/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ chip_test_suite_using_nltest("tests") {
3636

3737
public_deps = [
3838
"${chip_root}/src/lib/core",
39-
"${chip_root}/src/lib/support:testing",
39+
"${chip_root}/src/lib/support:test_utils",
40+
"${chip_root}/src/lib/support:testing_nlunit",
4041
"${chip_root}/src/platform",
4142
"${nlunit_test_root}:nlunit-test",
4243
]

‎src/lib/dnssd/minimal_mdns/core/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ chip_test_suite_using_nltest("tests") {
4343
":support",
4444
"${chip_root}/src/lib/core",
4545
"${chip_root}/src/lib/dnssd/minimal_mdns/core",
46-
"${chip_root}/src/lib/support:testing",
46+
"${chip_root}/src/lib/support:testing_nlunit",
4747
"${nlunit_test_root}:nlunit-test",
4848
]
4949
}

‎src/lib/dnssd/minimal_mdns/records/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ chip_test_suite_using_nltest("tests") {
3434
public_deps = [
3535
"${chip_root}/src/lib/core",
3636
"${chip_root}/src/lib/dnssd/minimal_mdns/records",
37-
"${chip_root}/src/lib/support:testing",
37+
"${chip_root}/src/lib/support:testing_nlunit",
3838
"${nlunit_test_root}:nlunit-test",
3939
]
4040
}

‎src/lib/dnssd/minimal_mdns/responders/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ chip_test_suite_using_nltest("tests") {
3434
"${chip_root}/src/lib/dnssd/minimal_mdns",
3535
"${chip_root}/src/lib/dnssd/minimal_mdns:default_policy",
3636
"${chip_root}/src/lib/dnssd/minimal_mdns/responders",
37-
"${chip_root}/src/lib/support:testing",
37+
"${chip_root}/src/lib/support:testing_nlunit",
3838
"${nlunit_test_root}:nlunit-test",
3939
]
4040
}

‎src/lib/dnssd/minimal_mdns/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ chip_test_suite_using_nltest("tests") {
3838
"${chip_root}/src/lib/core",
3939
"${chip_root}/src/lib/dnssd",
4040
"${chip_root}/src/lib/dnssd/minimal_mdns",
41-
"${chip_root}/src/lib/support:testing",
41+
"${chip_root}/src/lib/support:testing_nlunit",
4242
"${chip_root}/src/transport/raw/tests:helpers",
4343
"${nlunit_test_root}:nlunit-test",
4444
]

‎src/lib/dnssd/platform/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ chip_test_suite_using_nltest("tests") {
2525

2626
public_deps = [
2727
"${chip_root}/src/lib/dnssd",
28-
"${chip_root}/src/lib/support:testing",
28+
"${chip_root}/src/lib/support:testing_nlunit",
2929
"${nlunit_test_root}:nlunit-test",
3030
]
3131
}

‎src/lib/dnssd/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ chip_test_suite_using_nltest("tests") {
2828

2929
public_deps = [
3030
"${chip_root}/src/lib/dnssd",
31-
"${chip_root}/src/lib/support:testing",
31+
"${chip_root}/src/lib/support:testing_nlunit",
3232
"${nlunit_test_root}:nlunit-test",
3333
]
3434

‎src/lib/format/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ chip_test_suite_using_nltest("tests") {
4040
"${chip_root}/src/lib/format:flat-tree",
4141
"${chip_root}/src/lib/format:protocol-decoder",
4242
"${chip_root}/src/lib/format:protocol-tlv-metadata",
43-
"${chip_root}/src/lib/support:testing",
43+
"${chip_root}/src/lib/support:testing_nlunit",
4444
"${nlunit_test_root}:nlunit-test",
4545
]
4646
}

‎src/lib/shell/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ chip_test_suite_using_nltest("tests") {
3131
public_deps = [
3232
"${chip_root}/src/lib/core",
3333
"${chip_root}/src/lib/shell",
34-
"${chip_root}/src/lib/support:testing",
34+
"${chip_root}/src/lib/support:testing_nlunit",
3535
"${nlunit_test_root}:nlunit-test",
3636
]
3737
}

‎src/lib/support/BUILD.gn

+12-3
Original file line numberDiff line numberDiff line change
@@ -297,16 +297,25 @@ static_library("support") {
297297
}
298298
}
299299

300-
static_library("testing") {
300+
static_library("test_utils") {
301+
output_name = "libTestUtils"
302+
output_dir = "${root_out_dir}/lib"
303+
deps = [ "${chip_root}/src/platform" ]
304+
305+
sources = [
306+
"UnitTestUtils.cpp",
307+
"UnitTestUtils.h",
308+
]
309+
}
310+
311+
static_library("testing_nlunit") {
301312
output_name = "libSupportTesting"
302313
output_dir = "${root_out_dir}/lib"
303314

304315
sources = [
305316
"UnitTestExtendedAssertions.h",
306317
"UnitTestRegistration.cpp",
307318
"UnitTestRegistration.h",
308-
"UnitTestUtils.cpp",
309-
"UnitTestUtils.h",
310319
]
311320

312321
public_deps = [

‎src/lib/support/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ chip_test_suite_using_nltest("tests") {
7878
public_deps = [
7979
"${chip_root}/src/credentials",
8080
"${chip_root}/src/lib/core",
81-
"${chip_root}/src/lib/support:testing",
81+
"${chip_root}/src/lib/support:testing_nlunit",
8282
"${chip_root}/src/lib/support/jsontlv",
8383
"${chip_root}/src/platform",
8484
"${nlunit_test_root}:nlunit-test",

‎src/messaging/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ chip_test_suite_using_nltest("tests") {
7272
"${chip_root}/src/inet/tests:helpers",
7373
"${chip_root}/src/lib/core",
7474
"${chip_root}/src/lib/support",
75-
"${chip_root}/src/lib/support:testing",
75+
"${chip_root}/src/lib/support:test_utils",
76+
"${chip_root}/src/lib/support:testing_nlunit",
7677
"${chip_root}/src/messaging",
7778
"${chip_root}/src/protocols",
7879
"${chip_root}/src/transport",

‎src/platform/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ if (chip_device_platform != "none" && chip_device_platform != "fake") {
4040

4141
public_deps = [
4242
"${chip_root}/src/lib/support",
43-
"${chip_root}/src/lib/support:testing",
43+
"${chip_root}/src/lib/support:test_utils",
44+
"${chip_root}/src/lib/support:testing_nlunit",
4445
"${chip_root}/src/platform",
4546
"${chip_root}/src/system",
4647
"${nlunit_test_root}:nlunit-test",

‎src/protocols/bdx/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ chip_test_suite_using_nltest("tests") {
3131
public_deps = [
3232
"${chip_root}/src/lib/core",
3333
"${chip_root}/src/lib/support",
34-
"${chip_root}/src/lib/support:testing",
34+
"${chip_root}/src/lib/support:testing_nlunit",
3535
"${chip_root}/src/protocols/bdx",
3636
"${nlio_root}:nlio",
3737
"${nlunit_test_root}:nlunit-test",

‎src/protocols/interaction_model/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_test_suite_using_nltest("tests") {
2626
public_deps = [
2727
"${chip_root}/src/lib/core",
2828
"${chip_root}/src/lib/support",
29-
"${chip_root}/src/lib/support:testing",
29+
"${chip_root}/src/lib/support:testing_nlunit",
3030
"${chip_root}/src/protocols/interaction_model",
3131
"${nlunit_test_root}:nlunit-test",
3232
]

‎src/protocols/secure_channel/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ chip_test_suite_using_nltest("tests") {
2929
"${chip_root}/src/crypto/tests:tests.lib",
3030
"${chip_root}/src/lib/core",
3131
"${chip_root}/src/lib/support",
32-
"${chip_root}/src/lib/support:testing",
32+
"${chip_root}/src/lib/support:test_utils",
33+
"${chip_root}/src/lib/support:testing_nlunit",
3334
"${chip_root}/src/messaging/tests:helpers",
3435
"${chip_root}/src/protocols",
3536
"${chip_root}/src/protocols/secure_channel",

‎src/protocols/user_directed_commissioning/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ chip_test_suite_using_nltest("tests") {
2525
public_deps = [
2626
"${chip_root}/src/lib/core",
2727
"${chip_root}/src/lib/support",
28-
"${chip_root}/src/lib/support:testing",
28+
"${chip_root}/src/lib/support:testing_nlunit",
2929
"${chip_root}/src/protocols",
3030
"${nlio_root}:nlio",
3131
"${nlunit_test_root}:nlunit-test",

‎src/setup_payload/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chip_test_suite_using_nltest("tests") {
3333
cflags = [ "-Wconversion" ]
3434

3535
public_deps = [
36-
"${chip_root}/src/lib/support:testing",
36+
"${chip_root}/src/lib/support:testing_nlunit",
3737
"${chip_root}/src/platform",
3838
"${chip_root}/src/setup_payload",
3939
"${nlunit_test_root}:nlunit-test",

‎src/system/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ chip_test_suite_using_nltest("tests") {
4747

4848
public_deps = [
4949
"${chip_root}/src/inet",
50-
"${chip_root}/src/lib/support:testing",
50+
"${chip_root}/src/lib/support:testing_nlunit",
5151
"${chip_root}/src/platform",
5252
"${chip_root}/src/system",
5353
"${nlunit_test_root}:nlunit-test",

‎src/test_driver/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ silabs_executable("efr32_device_tests") {
8484
"${chip_root}/examples/common/pigweed:system_rpc_server",
8585
"${chip_root}/src:tests",
8686
"${chip_root}/src/lib",
87-
"${chip_root}/src/lib/support:testing",
87+
"${chip_root}/src/lib/support:testing_nlunit",
8888
"${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
8989
"${nlunit_test_root}:nlunit-test",
9090
]

‎src/test_driver/esp32/cmake/esp32_unit_tests.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ macro(esp32_unit_test)
3737
-Wl,--whole-archive ${UNIT_TEST_LIBRARY} -Wl,--no-whole-archive
3838
${UNIT_TEST_EXTRA_LIBRARIES}
3939
-lSupportTesting
40+
-lTestUtils
4041
nlunit-test
4142
nlfaultinjection
4243
)

‎src/tracing/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (matter_enable_tracing_support && matter_trace_config == "multiplexed") {
2727
sources = []
2828

2929
public_deps = [
30-
"${chip_root}/src/lib/support:testing",
30+
"${chip_root}/src/lib/support:testing_nlunit",
3131
"${chip_root}/src/platform",
3232
"${chip_root}/src/tracing",
3333
"${nlunit_test_root}:nlunit-test",

‎src/transport/raw/tests/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ chip_test_suite_using_nltest("tests") {
5050
"${chip_root}/src/inet/tests:helpers",
5151
"${chip_root}/src/lib/core",
5252
"${chip_root}/src/lib/support",
53-
"${chip_root}/src/lib/support:testing",
53+
"${chip_root}/src/lib/support:test_utils",
54+
"${chip_root}/src/lib/support:testing_nlunit",
5455
"${chip_root}/src/transport",
5556
"${chip_root}/src/transport/raw",
5657
"${nlio_root}:nlio",

‎src/transport/retransmit/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ chip_test_suite_using_nltest("tests") {
3030
]
3131

3232
public_deps = [
33-
"${chip_root}/src/lib/support:testing",
33+
"${chip_root}/src/lib/support:testing_nlunit",
3434
"${chip_root}/src/transport/retransmit",
3535
"${nlio_root}:nlio",
3636
"${nlunit_test_root}:nlunit-test",

‎src/transport/tests/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ chip_test_suite_using_nltest("tests") {
5555
"${chip_root}/src/inet/tests:helpers",
5656
"${chip_root}/src/lib/core",
5757
"${chip_root}/src/lib/support",
58-
"${chip_root}/src/lib/support:testing",
58+
"${chip_root}/src/lib/support:testing_nlunit",
5959
"${chip_root}/src/protocols",
6060
"${chip_root}/src/transport",
6161
"${chip_root}/src/transport/tests:helpers",

0 commit comments

Comments
 (0)