Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge error causing test failures. #14773

Merged
merged 1 commit into from
Feb 4, 2022
Merged

Fix merge error causing test failures. #14773

merged 1 commit into from
Feb 4, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

Merging #14487
violated the API contract that was established in
#14688, so we
started failing tests. The two PRs had never been run through CI
together.

Problem

CI failing on tip.

Change overview

Fix the return values to do what the API says.

Testing

Ran YAML tests locally, passed.

@restyled-io restyled-io bot mentioned this pull request Feb 4, 2022
Closed
@bzbarsky-apple
Fix merge error causing test failures.
c0460b2 
Merging project-chip#14487
violated the API contract that was established in
project-chip#14688, so we
started failing tests.  The two PRs had never been run through CI
together.
@bzbarsky-apple bzbarsky-apple added the hotfix urgent fix needed, can bypass review label Feb 4, 2022
@pullapprove pullapprove bot added review - pending and removed hotfix urgent fix needed, can bypass review labels Feb 4, 2022
@github-actions
Copy link

github-actions bot commented Feb 4, 2022 •
edited
Loading

PR #14773: Size comparison from 44c2895 to c0460b2

Decreases (20 builds for cyw30739, efr32, esp32, k32w, nrfconnect, p6, qpg, telink)
platform target config section 44c2895 c0460b2 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 587130 587118 -12 -0.0
.app_xip_area 493728 493716 -12 -0.0
lock cyw930739m2evb_01 (read/write) 545046 545034 -12 -0.0
.app_xip_area 453204 453192 -12 -0.0
ota-requestor cyw930739m2evb_01 (read/write) 569418 569406 -12 -0.0
.app_xip_area 468256 468244 -12 -0.0
efr32 window-app BRD4161A (read only) 829012 828996 -16 -0.0
.text 829004 828988 -16 -0.0
esp32 all-clusters-app c3devkit (read only) 935314 935310 -4 -0.0
.flash.text 935314 935310 -4 -0.0
m5stack (read only) 983359 983335 -24 -0.0
.flash.text 977975 977951 -24 -0.0
k32w lock k32w061+release (read/write) 673220 673204 -16 -0.0
.text 589348 589332 -16 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 997587 997571 -16 -0.0
text 680948 680936 -12 -0.0
nrf52840dk_nrf52840+rpc (read/write) 979439 979423 -16 -0.0
text 676000 675992 -8 -0.0
nrf52840dongle_nrf52840 (read/write) 1014275 1014259 -16 -0.0
text 686440 686428 -12 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 904278 904262 -16 -0.0
text 595960 595948 -12 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 929727 929711 -16 -0.0
text 626808 626796 -12 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 837254 837238 -16 -0.0
text 542596 542584 -12 -0.0
pump-app nrf52840dk_nrf52840 text 629144 629132 -12 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 927299 927283 -16 -0.0
text 625084 625072 -12 -0.0
p6 all-clusters-app default (read/write) 2448200 2448184 -16 -0.0
.text 1406464 1406448 -16 -0.0
light-app default (read/write) 2353104 2353088 -16 -0.0
.text 1311368 1311352 -16 -0.0
qpg lighting-app qpg6105+debug (read only) 579900 579892 -8 -0.0
.text 574580 574572 -8 -0.0
lock-app qpg6105+debug (read only) 525972 525964 -8 -0.0
.text 520652 520644 -8 -0.0
telink lighting-app tlsr9518adk80d (read/write) 858826 858818 -8 -0.0
text 601994 601990 -4 -0.0
Full report (34 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 44c2895 c0460b2 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 587130 587118 -12 -0.0
.app_xip_area 493728 493716 -12 -0.0
.bss 76124 76124 0 0.0
.data 624 624 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 545046 545034 -12 -0.0
.app_xip_area 453204 453192 -12 -0.0
.bss 74596 74596 0 0.0
.data 588 588 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 569418 569406 -12 -0.0
.app_xip_area 468256 468244 -12 -0.0
.bss 83588 83588 0 0.0
.data 532 532 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 856792 856792 0 0.0
(read/write) 125888 125888 0 0.0
.bss 123960 123960 0 0.0
.data 1924 1924 0 0.0
.text 856784 856784 0 0.0
BRD4161A+rpc (read only) 844168 844168 0 0.0
(read/write) 142544 142544 0 0.0
.bss 140520 140520 0 0.0
.data 2024 2024 0 0.0
.text 844160 844160 0 0.0
window-app BRD4161A (read only) 829012 828996 -16 -0.0
(read/write) 124524 124524 0 0.0
.bss 122644 122644 0 0.0
.data 1880 1880 0 0.0
.text 829004 828988 -16 -0.0
esp32 all-clusters-app c3devkit (read only) 935314 935310 -4 -0.0
(read/write) 1401162 1401162 0 0.0
.dram0.bss 70056 70056 0 0.0
.dram0.data 14276 14276 0 0.0
.flash.rodata 197920 197920 0 0.0
.flash.text 935314 935310 -4 -0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 983359 983335 -24 -0.0
(read/write) 465516 465516 0 0.0
.dram0.bss 74816 74816 0 0.0
.dram0.data 34040 34040 0 0.0
.flash.rodata 224532 224532 0 0.0
.flash.text 977975 977951 -24 -0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 671632 671632 0 0.0
.bss 75828 75828 0 0.0
.data 1884 1884 0 0.0
.text 588120 588120 0 0.0
lock k32w061+release (read/write) 673220 673204 -16 -0.0
.bss 76148 76148 0 0.0
.data 1924 1924 0 0.0
.text 589348 589332 -16 -0.0
linux chip-tool-ipv6only arm64 (read only) 7171332 7171332 0 0.0
(read/write) 283441 283441 0 0.0
.bss 47457 47457 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 185656 185656 0 0.0
.dynamic 560 560 0 0.0
.got 45424 45424 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 390508 390508 0 0.0
.text 6179092 6179092 0 0.0
thermostat-no-ble arm64 (read only) 2125964 2125964 0 0.0
(read/write) 140785 140785 0 0.0
.bss 57745 57745 0 0.0
.data 976 976 0 0.0
.data.rel.ro 74928 74928 0 0.0
.dynamic 560 560 0 0.0
.got 4160 4160 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 131292 131292 0 0.0
.text 1776528 1776528 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2386968 2386968 0 0.0
.bss 188964 188964 0 0.0
.data 5296 5296 0 0.0
.text 1349568 1349568 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2347552 2347552 0 0.0
.bss 181072 181072 0 0.0
.data 5600 5600 0 0.0
.text 1310152 1310152 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2311552 2311552 0 0.0
.bss 180960 180960 0 0.0
.data 5584 5584 0 0.0
.text 1274152 1274152 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2301820 2301820 0 0.0
.bss 178244 178244 0 0.0
.data 5400 5400 0 0.0
.text 1264392 1264392 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 997587 997571 -16 -0.0
bss 120540 120540 0 0.0
rodata 117184 117184 0 0.0
text 680948 680936 -12 -0.0
nrf52840dk_nrf52840+rpc (read/write) 979439 979423 -16 -0.0
bss 116396 116396 0 0.0
rodata 108572 108572 0 0.0
text 676000 675992 -8 -0.0
nrf52840dongle_nrf52840 (read/write) 1014275 1014259 -16 -0.0
bss 121904 121904 0 0.0
rodata 116020 116020 0 0.0
text 686440 686428 -12 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 904278 904262 -16 -0.0
bss 117104 117104 0 0.0
rodata 110440 110440 0 0.0
text 595960 595948 -12 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 929727 929711 -16 -0.0
bss 118880 118880 0 0.0
rodata 105532 105532 0 0.0
text 626808 626796 -12 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 837254 837238 -16 -0.0
bss 115472 115472 0 0.0
rodata 98704 98704 0 0.0
text 542596 542584 -12 -0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 932343 932343 0 0.0
bss 118632 118632 0 0.0
rodata 106004 106004 0 0.0
text 629144 629132 -12 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 927299 927283 -16 -0.0
bss 118632 118632 0 0.0
rodata 105008 105008 0 0.0
text 625084 625072 -12 -0.0
shell nrf52840dk_nrf52840 (read/write) 802571 802571 0 0.0
bss 110968 110968 0 0.0
rodata 78480 78480 0 0.0
text 535544 535544 0 0.0
p6 all-clusters-app default (read/write) 2448200 2448184 -16 -0.0
.bss 117124 117124 0 0.0
.data 2584 2584 0 0.0
.text 1406464 1406448 -16 -0.0
light-app default (read/write) 2353104 2353088 -16 -0.0
.bss 106268 106268 0 0.0
.data 2432 2432 0 0.0
.text 1311368 1311352 -16 -0.0
lock-app default (read/write) 2318288 2318288 0 0.0
.bss 105980 105980 0 0.0
.data 2392 2392 0 0.0
.text 1276552 1276552 0 0.0
qpg lighting-app qpg6105+debug (read only) 579900 579892 -8 -0.0
(read/write) 146940 146940 0 0.0
.bss 88120 88120 0 0.0
.data 1088 1088 0 0.0
.text 574580 574572 -8 -0.0
lock-app qpg6105+debug (read only) 525972 525964 -8 -0.0
(read/write) 146940 146940 0 0.0
.bss 87560 87560 0 0.0
.data 1024 1024 0 0.0
.text 520652 520644 -8 -0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 858826 858818 -8 -0.0
bss 88476 88476 0 0.0
noinit 37160 37160 0 0.0
text 601994 601990 -4 -0.0

@bzbarsky-apple bzbarsky-apple added the hotfix urgent fix needed, can bypass review label Feb 4, 2022
@bzbarsky-apple bzbarsky-apple merged commit 1fafe32 into project-chip:master Feb 4, 2022
@bzbarsky-apple bzbarsky-apple deleted the fix-tests branch February 4, 2022 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msandstedt msandstedt msandstedt approved these changes

@carol-apple carol-apple carol-apple approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@austinh0 austinh0 Awaiting requested review from austinh0

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
hotfix urgent fix needed, can bypass review review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bzbarsky-apple @msandstedt @carol-apple