Skip to content

Commit cd9cffb

Browse files
authored
[CI] Ensure that libshell is disabled when running tests using scripts/tests/run_tests_suite.py since it rely on SIGTERM and building libshell disables it on example apps using examples/platform/linux (#35848)
1 parent efd6e69 commit cd9cffb

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

.github/workflows/darwin-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
build_variant: [no-ble-asan-clang]
40+
build_variant: [no-ble-no-shell-asan-clang]
4141
env:
4242
BUILD_VARIANT: ${{matrix.build_variant}}
4343

.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
build_variant: [no-ble-tsan-clang]
40+
build_variant: [no-ble-no-shell-tsan-clang]
4141
chip_tool: [""]
4242
env:
4343
BUILD_VARIANT: ${{matrix.build_variant}}
@@ -331,7 +331,7 @@ jobs:
331331

332332
strategy:
333333
matrix:
334-
build_variant: [no-ble-asan-clang, no-ble-tsan-clang]
334+
build_variant: [no-ble-no-shell-asan-clang, no-ble-no-shell-tsan-clang]
335335
chip_tool: [""]
336336
env:
337337
BUILD_VARIANT: ${{matrix.build_variant}}

scripts/build/build/targets.py

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def BuildHostTarget():
169169
target.AppendModifier("no-ble", enable_ble=False)
170170
target.AppendModifier("no-wifi", enable_wifi=False)
171171
target.AppendModifier("no-thread", enable_thread=False)
172+
target.AppendModifier('no-shell', disable_shell=True)
172173
target.AppendModifier(
173174
"mbedtls", crypto_library=HostCryptoLibrary.MBEDTLS).ExceptIfRe('-boringssl')
174175
target.AppendModifier(

scripts/build/builders/host.py

+4
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
324324
chip_casting_simplified: Optional[bool] = None,
325325
data_model_interface: Optional[str] = None,
326326
chip_data_model_check_die_on_failure: Optional[bool] = None,
327+
disable_shell=False
327328
):
328329
super(HostBuilder, self).__init__(
329330
root=os.path.join(root, 'examples', app.ExamplePath()),
@@ -349,6 +350,9 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE,
349350
if not enable_thread:
350351
self.extra_gn_options.append('chip_enable_openthread=false')
351352

353+
if disable_shell:
354+
self.extra_gn_options.append('chip_build_libshell=false')
355+
352356
if use_tsan:
353357
self.extra_gn_options.append('is_tsan=true')
354358

scripts/build/testdata/all_targets_linux_x64.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ efr32-{brd2704b,brd4316a,brd4317a,brd4318a,brd4319a,brd4186a,brd4187a,brd2601b,b
99
esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,energy-management,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing][-data-model-disabled][-data-model-enabled]
1010
genio-lighting-app
1111
linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang]
12-
linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,light-data-model-no-unique-id,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,fabric-admin,fabric-bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,microwave-oven,refrigerator,rvc,air-purifier,lit-icd,air-quality-sensor,network-manager,energy-management}[-nodeps][-nlfaultinject][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui][-evse-test-event][-enable-dnssd-tests][-disable-dnssd-tests][-chip-casting-simplified][-data-model-check][-data-model-disabled][-data-model-enabled][-check-failure-die]
12+
linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,light-data-model-no-unique-id,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,fabric-admin,fabric-bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,microwave-oven,refrigerator,rvc,air-purifier,lit-icd,air-quality-sensor,network-manager,energy-management}[-nodeps][-nlfaultinject][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-no-shell][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui][-evse-test-event][-enable-dnssd-tests][-disable-dnssd-tests][-chip-casting-simplified][-data-model-check][-data-model-disabled][-data-model-enabled][-check-failure-die]
1313
linux-x64-efr32-test-runner[-clang]
1414
imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
1515
infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage][-trustm]

0 commit comments

Comments
 (0)