From b8368a1ae85be85a068feb563a8db658c6659a58 Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Wed, 19 Apr 2023 04:49:05 +0200 Subject: [PATCH] [Tizen] Allow to build examples without Thread (#26137) --- .github/workflows/qemu.yaml | 2 +- scripts/build/build/targets.py | 9 +++++---- scripts/build/builders/tizen.py | 3 +++ scripts/build/testdata/all_targets_linux_x64.txt | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 9cff443cfeb0c3..3883512f0d729b 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -135,6 +135,6 @@ jobs: run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ - --target tizen-arm-tests-no-ble \ + --target tizen-arm-tests-no-ble-no-thread \ build " diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index b078416f01b01f..afeff7ef8a2b73 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -476,10 +476,11 @@ def BuildTizenTarget(): TargetPart('tests', app=TizenApp.TESTS), ]) - target.AppendModifier(name="no-ble", enable_ble=False) - target.AppendModifier(name="no-wifi", enable_wifi=False) - target.AppendModifier(name="asan", use_asan=True) - target.AppendModifier(name="ubsan", use_ubsan=True) + target.AppendModifier("no-ble", enable_ble=False) + target.AppendModifier("no-thread", enable_thread=False) + target.AppendModifier("no-wifi", enable_wifi=False) + target.AppendModifier("asan", use_asan=True) + target.AppendModifier("ubsan", use_ubsan=True) return target diff --git a/scripts/build/builders/tizen.py b/scripts/build/builders/tizen.py index a8f9b3d497b5fb..e62e8fdffd11e9 100644 --- a/scripts/build/builders/tizen.py +++ b/scripts/build/builders/tizen.py @@ -88,6 +88,7 @@ def __init__(self, app: TizenApp = TizenApp.LIGHT, board: TizenBoard = TizenBoard.ARM, enable_ble: bool = True, + enable_thread: bool = True, enable_wifi: bool = True, use_asan: bool = False, use_tsan: bool = False, @@ -114,6 +115,8 @@ def __init__(self, if not enable_ble: self.extra_gn_options.append('chip_config_network_layer_ble=false') + if not enable_thread: + self.extra_gn_options.append('chip_enable_openthread=false') if not enable_wifi: self.extra_gn_options.append('chip_enable_wifi=false') if use_asan: diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt index 5488d53d05a8f5..b117fe363a994d 100644 --- a/scripts/build/testdata/all_targets_linux_x64.txt +++ b/scripts/build/testdata/all_targets_linux_x64.txt @@ -18,6 +18,6 @@ mw320-all-clusters-app nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,light-switch,shell,pump,pump-controller,window-covering}[-rpc] nrf-native-posix-64-tests qpg-qpg6105-{lock,light,shell,persistent-storage} -tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-wifi][-asan][-ubsan] +tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan] telink-tlsr9518adk80d-{all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,temperature-measurement,thermostat,window-covering}[-rpc][-factory-data] openiotsdk-{shell,lock}