Skip to content

Commit 66c9b9a

Browse files
committed
[nrfconnect] Allow running only specific test suites
Run only specific test suites by adding `-testargs <TEST_SUITE_NAME>..` arguments to test executable invocation. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent dee2ac3 commit 66c9b9a

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

src/test_driver/nrfconnect/CMakeLists.txt

+20
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ set(CHIP_CFLAGS
4848
list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
4949
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
5050

51+
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
52+
5153
# ==================================================
5254
# Build 'all tests' runner
5355
# ==================================================
@@ -56,6 +58,24 @@ project(AllChipTests)
5658
enable_testing()
5759

5860
target_sources(app PRIVATE main/runner.cpp)
61+
target_include_directories(app PUBLIC
62+
${PIGWEED_ROOT}/pw_assert/public
63+
${PIGWEED_ROOT}/pw_assert_zephyr/public
64+
${PIGWEED_ROOT}/pw_assert_zephyr/public_overrides
65+
${PIGWEED_ROOT}/pw_bytes/public
66+
${PIGWEED_ROOT}/pw_preprocessor/public
67+
${PIGWEED_ROOT}/pw_polyfill/public
68+
${PIGWEED_ROOT}/pw_polyfill/standard_library_public
69+
${PIGWEED_ROOT}/pw_polyfill/public_overrides
70+
${PIGWEED_ROOT}/pw_result/public
71+
${PIGWEED_ROOT}/pw_span/public
72+
${PIGWEED_ROOT}/pw_span/public_overrides
73+
${PIGWEED_ROOT}/pw_status/public
74+
${PIGWEED_ROOT}/pw_string/public
75+
${PIGWEED_ROOT}/pw_unit_test/public
76+
${PIGWEED_ROOT}/pw_unit_test/light_public_overrides
77+
${PIGWEED_ROOT}/third_party/fuchsia/repo/sdk/lib/stdcompat/include
78+
)
5979
target_link_libraries(app PUBLIC chip $<TARGET_FILE:kernel>)
6080
target_compile_definitions(app PUBLIC CHIP_HAVE_CONFIG_H)
6181

src/test_driver/nrfconnect/main/runner.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
#include <lib/support/CodeUtils.h>
1919
#include <lib/support/UnitTest.h>
2020
#include <platform/CHIPDeviceLayer.h>
21+
#include <pw_unit_test/framework.h>
2122

2223
#include <unistd.h>
24+
#include <vector>
2325

26+
#include <nsi_cmdline.h>
2427
#include <zephyr/logging/log.h>
2528
#include <zephyr/settings/settings.h>
2629

@@ -33,6 +36,18 @@ int main(void)
3336
{
3437
VerifyOrDie(settings_subsys_init() == 0);
3538

39+
int argc;
40+
char ** argv;
41+
nsi_get_test_cmd_line_args(&argc, &argv);
42+
43+
std::vector<std::string_view> suites_to_run;
44+
for (int i = 0; i < argc; ++i)
45+
{
46+
suites_to_run.push_back(argv[i]);
47+
}
48+
49+
pw::unit_test::SetTestSuitesToRun(suites_to_run);
50+
3651
LOG_INF("Starting CHIP tests!");
3752
int status = 0;
3853
status += chip::test::RunAllTests();

0 commit comments

Comments
 (0)