Skip to content

Commit

Permalink
Add pigweed support for nrfconnect (project-chip#32460)
Browse files Browse the repository at this point in the history
* Add pigweed support for nrfconnect

* Restyled by gn

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
jlatusek and restyled-commits authored Mar 7, 2024
1 parent 873e665 commit c2f58e4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
10 changes: 10 additions & 0 deletions config/nrfconnect/chip-gn/.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

# The location of the build configuration file.
buildconfig = "${build_root}/config/BUILDCONFIG.gn"
Expand All @@ -25,5 +26,14 @@ default_args = {
target_cpu = "arm"
target_os = "zephyr"

pw_sys_io_BACKEND = dir_pw_sys_io_stdio
pw_assert_BACKEND = dir_pw_assert_log
pw_log_BACKEND = dir_pw_log_basic

pw_build_LINK_DEPS = [
"$dir_pw_assert:impl",
"$dir_pw_log:impl",
]

import("${chip_root}/config/nrfconnect/chip-gn/args.gni")
}
3 changes: 2 additions & 1 deletion src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ if (chip_build_tests) {
if (chip_monolithic_tests) {
# TODO [PW_MIGRATION] Remove this if after migartion to PW_TEST is completed for all platforms
# TODO [PW_MIGRATION] There will be a list of already migrated platforms
if (chip_device_platform == "esp32") {
if (chip_device_platform == "esp32" ||
chip_device_platform == "nrfconnect") {
deps += [ "${chip_root}/src/lib/support:pw_tests_wrapper" ]
}
build_monolithic_library = true
Expand Down
2 changes: 2 additions & 0 deletions src/test_driver/nrfconnect/main/runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

#include <lib/support/CodeUtils.h>
#include <lib/support/UnitTest.h>
#include <lib/support/UnitTestRegistration.h>
#include <platform/CHIPDeviceLayer.h>

Expand All @@ -35,6 +36,7 @@ extern "C" int main(void)

LOG_INF("Starting CHIP tests!");
int status = RunRegisteredUnitTests();
status += chip::test::RunAllTests();
LOG_INF("CHIP test status: %d", status);

_exit(status);
Expand Down

0 comments on commit c2f58e4

Please sign in to comment.