From 2c1dcebaa7f5a3fb227b569a6778291c198aec95 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 29 Oct 2021 14:00:19 -0400 Subject: [PATCH] Unblacklist nrf52840 for RPC builds (#11206) * Unblacklist rpc builds for nrf52840. Only nrf5340 fails compilation * fix unit tests * Restyle fixes --- scripts/build/build/targets.py | 9 ++++++++- scripts/build/testdata/all_targets_except_host.txt | 2 +- scripts/build/testdata/glob_star_targets_except_host.txt | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index c0b5346be15169..ba7927b2deb9a4 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -164,11 +164,18 @@ def NrfTargets(): for target in targets: yield target.Extend('lock', app=NrfApp.LOCK) yield target.Extend('light', app=NrfApp.LIGHT) - yield target.Extend('light-rpc', app=NrfApp.LIGHT, enable_rpcs=True).GlobBlacklist('Compile failure due to pw_build args not forwarded to proto compiler. https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/66760') yield target.Extend('shell', app=NrfApp.SHELL) yield target.Extend('pump', app=NrfApp.PUMP) yield target.Extend('pump-controller', app=NrfApp.PUMP_CONTROLLER) + rpc = target.Extend('light-rpc', app=NrfApp.LIGHT, enable_rpcs=True) + + if '-nrf5340-' in rpc.name: + rpc = rpc.GlobBlacklist( + 'Compile failure due to pw_build args not forwarded to proto compiler. https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/66760') + + yield rpc + def AndroidTargets(): target = Target('android', AndroidBuilder) diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index 47b59abed64e97..8dc6550999a821 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -25,7 +25,7 @@ esp32-m5stack-all-clusters-rpc esp32-m5stack-all-clusters-rpc-ipv6only infineon-p6-lock nrf-nrf52840-light -nrf-nrf52840-light-rpc (NOGLOB: Compile failure due to pw_build args not forwarded to proto compiler. https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/66760) +nrf-nrf52840-light-rpc nrf-nrf52840-lock nrf-nrf52840-pump nrf-nrf52840-pump-controller diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt index 581495af81a2e3..72c4fac84e8590 100644 --- a/scripts/build/testdata/glob_star_targets_except_host.txt +++ b/scripts/build/testdata/glob_star_targets_except_host.txt @@ -25,6 +25,7 @@ esp32-m5stack-all-clusters-rpc esp32-m5stack-all-clusters-rpc-ipv6only infineon-p6-lock nrf-nrf52840-light +nrf-nrf52840-light-rpc nrf-nrf52840-lock nrf-nrf52840-pump nrf-nrf52840-pump-controller