Skip to content

Commit 2420d7a

Browse files
Alami-AmineAlami-Amine
authored
Merge branch 'master' into AA/FUZZTRIAL
2 parents 406ad00 + 8da30ca commit 2420d7a

File tree

954 files changed

+79824
-20568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

954 files changed

+79824
-20568
lines changed

‎.github/.wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ DS
454454
duplicative
455455
DUT
456456
DUTS
457+
DUT's
457458
DV
458459
DVK
459460
dynload
@@ -562,6 +563,7 @@ forkpty
562563
FOTA
563564
FreeRTOS
564565
FreeRTOSConfig
566+
FS
565567
fsl
566568
fstab
567569
fsync
@@ -854,6 +856,7 @@ MbedNewTarget
854856
mbedos
855857
mbedTarget
856858
mbedTLS
859+
MCORE
857860
mcu
858861
MCUboot
859862
mcumgr

‎.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
languages: "cpp"
7777
- name: Setup Build
78-
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
78+
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false chip_data_model_check_die_on_failure=true"
7979
- name: Run Build
8080
run: scripts/run_in_build_env.sh "ninja -C ./out"
8181
- name: Run Tests
@@ -179,7 +179,7 @@ jobs:
179179
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
180180
- name: Setup Build, Run Build and Run Tests
181181
run: |
182-
BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false"
182+
BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false chip_data_model_check_die_on_failure=true"
183183
scripts/run_in_build_env.sh "ninja -C ./out/gcc_release"
184184
BUILD_TYPE=gcc_release scripts/tests/gn_tests.sh
185185
- name: Clean output
@@ -197,7 +197,7 @@ jobs:
197197
esac
198198
199199
rm -rf ./out/sanitizers
200-
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
200+
BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --export-compile-commands
201201
BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
202202
done
203203
- name: Ensure codegen is done for sanitize
@@ -308,7 +308,7 @@ jobs:
308308

309309
- name: Setup Build, Run Build and Run Tests
310310
run: |
311-
scripts/build/gn_gen.sh --args="enable_rtti=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
311+
scripts/build/gn_gen.sh --args="enable_rtti=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false chip_data_model_check_die_on_failure=true"
312312
scripts/run_in_build_env.sh "ninja -C ./out"
313313
scripts/tests/gn_tests.sh
314314
- name: Setup test python environment
@@ -415,7 +415,7 @@ jobs:
415415
# clang.
416416
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
417417
esac
418-
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
418+
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --export-compile-commands
419419
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
420420
BUILD_TYPE=$BUILD_TYPE scripts/tests/gn_tests.sh
421421
done

‎.github/workflows/darwin.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
mkdir -p /tmp/darwin/framework-tests
115115
echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
116116
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
117-
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
118117
119118
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
120119

‎.github/workflows/examples-cc13xx_26xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
107107
cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
108-
out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
108+
out/artifacts/ti-cc13x4_26x4-lighting-ftd/chip-LP_EM_CC1354P10_6-lighting-example.out \
109109
/tmp/bloat_reports/
110110
- name: Uploading Size Reports
111111
uses: ./.github/actions/upload-size-reports

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:73
43+
image: ghcr.io/project-chip/chip-build-efr32:74
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ jobs:
149149
if [ "$idl_file" = './examples/placeholder/linux/apps/app2/config.matter' ]; then continue; fi
150150
if [ "$idl_file" = './examples/thermostat/thermostat-common/thermostat.matter' ]; then continue; fi
151151
if [ "$idl_file" = './examples/window-app/common/window-app.matter' ]; then continue; fi
152+
# Example is intentionally not spe compliant for use in cert testing
153+
if [ "$idl_file" = './examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter' ]; then continue; fi
152154
153155
# Test files are intentionally small and not spec-compilant, just parse-compliant
154156
if [ "$idl_file" = "./scripts/py_matter_idl/matter_idl/tests/inputs/cluster_struct_attribute.matter" ]; then continue; fi

‎.github/workflows/tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ jobs:
485485
--target linux-x64-energy-management-ipv6only-no-ble-no-wifi-tsan-clang-test \
486486
--target linux-x64-microwave-oven-ipv6only-no-ble-no-wifi-tsan-clang-test \
487487
--target linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test \
488+
--target linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test \
488489
--target linux-x64-python-bindings \
489490
build \
490491
--copy-artifacts-to objdir-clone \
@@ -498,6 +499,7 @@ jobs:
498499
echo "LIT_ICD_APP: out/linux-x64-lit-icd-ipv6only-no-ble-no-wifi-tsan-clang-test/lit-icd-app" >> /tmp/test_env.yaml
499500
echo "CHIP_MICROWAVE_OVEN_APP: out/linux-x64-microwave-oven-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-microwave-oven-app" >> /tmp/test_env.yaml
500501
echo "CHIP_RVC_APP: out/linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-rvc-app" >> /tmp/test_env.yaml
502+
echo "NETWORK_MANAGEMENT_APP: out/linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test/matter-network-manager-app" >> /tmp/test_env.yaml
501503
echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
502504
echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
503505
echo "TRACE_TEST_PERFETTO: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml

‎.github/workflows/unit_integration_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
*) ;;
7474
esac
7575
76-
scripts/build/gn_gen.sh --args="$GN_ARGS"
76+
scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true"
7777
- name: Run Build
7878
run: scripts/run_in_build_env.sh "ninja -C out/$BUILD_TYPE"
7979
- name: Run Tests

‎.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,17 @@
213213
[submodule "third_party/silabs/simplicity_sdk"]
214214
path = third_party/silabs/simplicity_sdk
215215
url = https://github.com/SiliconLabs/simplicity_sdk.git
216-
branch = v2024.6.0
216+
branch = v2024.6.1-0
217217
platforms = silabs
218218
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
219219
path = third_party/silabs/wiseconnect-wifi-bt-sdk
220220
url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
221-
branch = 2.8.2
221+
branch = 2.10.0
222222
platforms = silabs
223223
[submodule "third_party/silabs/wifi_sdk"]
224224
path = third_party/silabs/wifi_sdk
225225
url = https://github.com/SiliconLabs/wiseconnect.git
226-
branch = v3.3.0
226+
branch = v3.3.1
227227
platforms = silabs
228228
[submodule "editline"]
229229
path = third_party/editline/repo

‎build/config/compiler/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ declare_args() {
415415
config("sanitize_address") {
416416
defines = []
417417
cflags = [
418+
"-fsanitize-coverage=inline-8bit-counters,trace-cmp",
419+
"-fno-sanitize-coverage=pc-table",
418420
"-fsanitize=address",
419421
"-fno-omit-frame-pointer",
420422
]

‎config/esp32/components/chip/idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- if: "target != esp32h2"
2828

2929
espressif/esp_rcp_update:
30-
version: "1.0.3"
30+
version: "1.2.0"
3131
rules:
3232
- if: "idf_version >=5.0"
3333

‎config/telink/chip-module/Kconfig.defaults

-5
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,7 @@ config NVS_LOOKUP_CACHE_SIZE
219219
config SETTINGS_NVS_SECTOR_SIZE_MULT
220220
default 1
221221

222-
# Set sector counter of NVS
223-
config SETTINGS_NVS_SECTOR_COUNT
224-
default 12
225-
226222
# Enable OpenThread
227-
228223
config NET_L2_OPENTHREAD
229224
default y if !WIFI
230225

0 commit comments

Comments
 (0)