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.

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

[chip-tool] remove extra blank line in cert print #25188

Merged
merged 2 commits into from
Feb 23, 2023

Conversation

chshu
Copy link
Contributor

@chshu chshu commented Feb 20, 2023

Fixes https://github.com/CHIP-Specifications/chip-test-plans/issues/2434

It's a corner case when the cert length is a particular value, which ends at a complete line. chip-tool prints an extra blank line:
image

After the fix, the output looks good:
image

@github-actions
Copy link

PR #25188: Size comparison from 04adc52 to 3bf0a3c

Full report (1 build for cc32xx)
platform target config section 04adc52 3bf0a3c change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 642209 642209 0 0.0
(read/write) 203696 203696 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197096 197096 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 934242 934242 0 0.0
.debug_aranges 87448 87448 0 0.0
.debug_frame 300212 300212 0 0.0
.debug_info 20360287 20360287 0 0.0
.debug_line 2661052 2661052 0 0.0
.debug_loc 2797120 2797120 0 0.0
.debug_ranges 281744 281744 0 0.0
.debug_str 3019502 3019502 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105713 105713 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377379 377379 0 0.0
.symtab 256048 256048 0 0.0
.text 534376 534376 0 0.0

@pullapprove pullapprove bot requested a review from nivi-apple February 20, 2023 22:55
@chshu chshu force-pushed the bug/fix_cert_print branch from 3bf0a3c to cf6e4ee Compare February 21, 2023 04:29
@github-actions
Copy link

PR #25188: Size comparison from e64736c to cf6e4ee

Increases (1 build for cc32xx)
platform target config section e64736c cf6e4eea change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20254060 20254061 1 0.0
Full report (1 build for cc32xx)
platform target config section e64736c cf6e4eea change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 642545 642545 0 0.0
(read/write) 203664 203664 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197064 197064 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 930168 930168 0 0.0
.debug_aranges 87272 87272 0 0.0
.debug_frame 299752 299752 0 0.0
.debug_info 20254060 20254061 1 0.0
.debug_line 2655143 2655143 0 0.0
.debug_loc 2795383 2795383 0 0.0
.debug_ranges 281592 281592 0 0.0
.debug_str 3017470 3017470 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105817 105817 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377598 377598 0 0.0
.symtab 256144 256144 0 0.0
.text 534604 534604 0 0.0

Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this makes much more sense, thank you!

@andy31415
Copy link
Contributor

@chshu please fix restyle diffs

@chshu chshu force-pushed the bug/fix_cert_print branch from cf6e4ee to 84a944c Compare February 23, 2023 02:00
@github-actions
Copy link

github-actions bot commented Feb 23, 2023

PR #25188: Size comparison from 19fbda3 to 7b5c313

Increases (15 builds for bl602, bl702, cc13x2_26x2, cc32xx, linux, psoc6, qpg, telink)
platform target config section 19fbda3 7b5c313 change % change
bl602 lighting-app bl602+rpc .text 1056574 1056576 2 0.0
bl702 lighting-app bl702 .debug_info 40590272 40590273 1 0.0
.text 954988 954990 2 0.0
bl702+rpc .debug_info 45002511 45002512 1 0.0
.text 1032398 1032400 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 680343 680351 8 0.0
.text 591540 591548 8 0.0
pump-app LP_CC2652R7 (read only) 689731 689739 8 0.0
.text 598168 598176 8 0.0
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20249761 20249762 1 0.0
linux chip-tool-ipv6only arm64 (read only) 12061732 12061748 16 0.0
.text 9745204 9745220 16 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 27965689 27965690 1 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_info 27510288 27510289 1 0.0
lock cy8ckit_062s2_43012 .debug_info 23104757 23104758 1 0.0
qpg lock-app qpg6105+debug (read/write) 1118364 1118372 8 0.0
.text 565464 565472 8 0.0
telink all-clusters-app tlsr9518adk80d text 687196 687198 2 0.0
all-clusters-minimal-app tlsr9518adk80d (read/write) 951916 951924 8 0.0
text 648596 648598 2 0.0
light-switch-app tlsr9518adk80d (read/write) 871760 871768 8 0.0
text 592954 592958 4 0.0
ota-requestor-app tlsr9518adk80d text 602858 602860 2 0.0
Decreases (4 builds for cc13x2_26x2, telink)
platform target config section 19fbda3 7b5c313 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 170720 170712 -8 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643559 643551 -8 -0.0
.text 564880 564872 -8 -0.0
pump-app LP_CC2652R7 (read/write) 159436 159428 -8 -0.0
telink contact-sensor-app tlsr9518adk80d (read/write) 856048 856040 -8 -0.0
text 578950 578948 -2 -0.0
Full report (33 builds for bl602, bl702, cc13x2_26x2, cc32xx, cyw30739, k32w, linux, psoc6, qpg, telink)
platform target config section 19fbda3 7b5c313 change % change
bl602 lighting-app bl602 (read/write) 1349578 1349578 0 0.0
.bss 94666 94666 0 0.0
.data 9752 9752 0 0.0
.text 1025642 1025642 0 0.0
bl602+rpc (read/write) 1395010 1395010 0 0.0
.bss 102714 102714 0 0.0
.data 10144 10144 0 0.0
.text 1056574 1056576 2 0.0
bl702 lighting-app bl702 (read only) 3358 3358 0 0.0
(read/write) 1187923 1187923 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 69777 69777 0 0.0
.bss_psram 30064 30064 0 0.0
.comment 48 48 0 0.0
.data 4080 4080 0 0.0
.debug_abbrev 1551805 1551805 0 0.0
.debug_aranges 134240 134240 0 0.0
.debug_frame 492124 492124 0 0.0
.debug_info 40590272 40590273 1 0.0
.debug_line 5277270 5277270 0 0.0
.debug_loc 3415678 3415678 0 0.0
.debug_ranges 371928 371928 0 0.0
.debug_str 3574600 3574600 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 107904 107904 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 574193 574193 0 0.0
.symtab 173632 173632 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
954988 954990 2 0.0
bl702+rpc (read only) 3358 3358 0 0.0
(read/write) 1281055 1281055 0 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 77825 77825 0 0.0
.bss_psram 30320 30320 0 0.0
.comment 48 48 0 0.0
.data 4624 4624 0 0.0
.debug_abbrev 1700036 1700036 0 0.0
.debug_aranges 142480 142480 0 0.0
.debug_frame 519888 519888 0 0.0
.debug_info 45002511 45002512 1 0.0
.debug_line 5676204 5676204 0 0.0
.debug_loc 3612691 3612691 0 0.0
.debug_ranges 395704 395704 0 0.0
.debug_str 3978137 3978137 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 122544 122544 0 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 635257 635257 0 0.0
.symtab 192096 192096 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 0 0 0 0.0
1032398 1032400 2 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 680343 680351 8 0.0
(read/write) 170720 170712 -8 -0.0
.bss 80756 80756 0 0.0
.data 3352 3352 0 0.0
.rodata 88487 88487 0 0.0
.text 591540 591548 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643559 643551 -8 -0.0
(read/write) 157416 157416 0 0.0
.bss 79948 79948 0 0.0
.data 3352 3352 0 0.0
.rodata 78359 78359 0 0.0
.text 564880 564872 -8 -0.0
lock-ftd LP_CC2652R7 (read only) 676511 676511 0 0.0
(read/write) 171920 171920 0 0.0
.bss 78212 78212 0 0.0
.data 3316 3316 0 0.0
.rodata 76679 76679 0 0.0
.text 599352 599352 0 0.0
lock-mtd LP_CC2652R7 (read only) 663147 663147 0 0.0
(read/write) 180540 180540 0 0.0
.bss 73468 73468 0 0.0
.data 3316 3316 0 0.0
.rodata 103411 103411 0 0.0
.text 559256 559256 0 0.0
pump-app LP_CC2652R7 (read only) 689731 689739 8 0.0
(read/write) 159436 159428 -8 -0.0
.bss 78180 78180 0 0.0
.data 3280 3280 0 0.0
.rodata 91083 91083 0 0.0
.text 598168 598176 8 0.0
pump-controller-app LP_CC2652R7 (read only) 674683 674683 0 0.0
(read/write) 174628 174628 0 0.0
.bss 78324 78324 0 0.0
.data 3304 3304 0 0.0
.rodata 86971 86971 0 0.0
.text 587232 587232 0 0.0
shell LP_CC2652R7 (read only) 671558 671558 0 0.0
(read/write) 181576 181576 0 0.0
.bss 82828 82828 0 0.0
.data 3348 3348 0 0.0
.rodata 85230 85230 0 0.0
.text 586016 586016 0 0.0
cc32xx lock CC3235SF_LAUNCHXL (read only) 642569 642569 0 0.0
(read/write) 203664 203664 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197064 197064 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 930138 930138 0 0.0
.debug_aranges 87272 87272 0 0.0
.debug_frame 299764 299764 0 0.0
.debug_info 20249761 20249762 1 0.0
.debug_line 2655140 2655140 0 0.0
.debug_loc 2795460 2795460 0 0.0
.debug_ranges 281592 281592 0 0.0
.debug_str 3018033 3018033 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105817 105817 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377761 377761 0 0.0
.symtab 256256 256256 0 0.0
.text 0 0 0 0.0
534628 534628 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586178 586178 0 0.0
.app_xip_area 463076 463076 0 0.0
.bss 65544 65544 0 0.0
.data 740 740 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 590098 590098 0 0.0
.app_xip_area 461700 461700 0 0.0
.bss 70832 70832 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 551142 551142 0 0.0
.app_xip_area 433536 433536 0 0.0
.bss 60088 60088 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w contact k32w0+release (read/write) 669952 669952 0 0.0
.bss 77548 77548 0 0.0
.data 2204 2204 0 0.0
.text 571088 571088 0 0.0
light k32w0+release (read/write) 669028 669028 0 0.0
.bss 77228 77228 0 0.0
.data 2192 2192 0 0.0
.text 570496 570496 0 0.0
lock k32w0+release (read/write) 625656 625656 0 0.0
.bss 75356 75356 0 0.0
.data 2136 2136 0 0.0
.text 545436 545436 0 0.0
linux chip-tool-ipv6only arm64 (read only) 12061732 12061748 16 0.0
(read/write) 729224 729224 0 0.0
.bss 34136 34136 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 671552 671552 0 0.0
.dynamic 560 560 0 0.0
.got 15328 15328 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 585972 585972 0 0.0
.text 9745204 9745220 16 0.0
thermostat-no-ble arm64 (read only) 2515820 2515820 0 0.0
(read/write) 145048 145048 0 0.0
.bss 56312 56312 0 0.0
.data 1784 1784 0 0.0
.data.rel.ro 77568 77568 0 0.0
.dynamic 560 560 0 0.0
.got 5336 5336 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 150712 150712 0 0.0
.text 2103040 2103040 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841024 841024 0 0.0
(read/write) 1761060 1761060 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189680 189680 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2640 2640 0 0.0
.debug_abbrev 1253481 1253481 0 0.0
.debug_aranges 111392 111392 0 0.0
.debug_frame 374368 374368 0 0.0
.debug_info 27965689 27965690 1 0.0
.debug_line 3790188 3790188 0 0.0
.debug_loc 3691526 3691526 0 0.0
.debug_ranges 363408 363408 0 0.0
.debug_str 3527325 3527325 0 0.0
.heap 841024 841024 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 580827 580827 0 0.0
.symtab 425632 425632 0 0.0
.text 1560352 1560352 0 0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841840 841840 0 0.0
(read/write) 1701436 1701436 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188872 188872 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2632 2632 0 0.0
.debug_abbrev 1238814 1238814 0 0.0
.debug_aranges 110624 110624 0 0.0
.debug_frame 376704 376704 0 0.0
.debug_info 27510288 27510289 1 0.0
.debug_line 3797687 3797687 0 0.0
.debug_loc 3674728 3674728 0 0.0
.debug_ranges 361344 361344 0 0.0
.debug_str 3514447 3514447 0 0.0
.heap 841840 841840 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 540536 540536 0 0.0
.symtab 410544 410544 0 0.0
.text 1501544 1501544 0 0.0
.zero.table 8 8 0 0.0
light cy8ckit_062s2_43012 0 0 0 0.0
(read only) 850096 850096 0 0.0
(read/write) 1615148 1615148 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180784 180784 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1074191 1074191 0 0.0
.debug_aranges 102832 102832 0 0.0
.debug_frame 346996 346996 0 0.0
.debug_info 22853420 22853420 0 0.0
.debug_line 3350624 3350624 0 0.0
.debug_loc 3350302 3350302 0 0.0
.debug_ranges 319864 319864 0 0.0
.debug_str 3313193 3313193 0 0.0
.heap 850096 850096 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 476253 476253 0 0.0
.symtab 378528 378528 0 0.0
.text 1423512 1423512 0 0.0
.zero.table 8 8 0 0.0
lock cy8ckit_062s2_43012 0 0 0 0.0
(read only) 845120 845120 0 0.0
(read/write) 1648820 1648820 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185744 185744 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2480 2480 0 0.0
.debug_abbrev 1076135 1076135 0 0.0
.debug_aranges 103232 103232 0 0.0
.debug_frame 348752 348752 0 0.0
.debug_info 23104757 23104758 1 0.0
.debug_line 3352731 3352731 0 0.0
.debug_loc 3374671 3374671 0 0.0
.debug_ranges 322416 322416 0 0.0
.debug_str 3332004 3332004 0 0.0
.heap 845120 845120 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 479977 479977 0 0.0
.symtab 380704 380704 0 0.0
.text 1452208 1452208 0 0.0
.zero.table 8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1151396 1151396 0 0.0
.bss 99796 99796 0 0.0
.data 852 852 0 0.0
.text 598492 598492 0 0.0
lock-app qpg6105+debug (read/write) 1118364 1118372 8 0.0
.bss 96284 96284 0 0.0
.data 864 864 0 0.0
.text 565464 565472 8 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1016448 1016448 0 0.0
bss 97748 97748 0 0.0
text 687196 687198 2 0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 951916 951924 8 0.0
bss 96800 96800 0 0.0
text 648596 648598 2 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 856048 856040 -8 -0.0
bss 88968 88968 0 0.0
text 578950 578948 -2 -0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 871760 871768 8 0.0
bss 89052 89052 0 0.0
text 592954 592958 4 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 950472 950472 0 0.0
bss 97176 97176 0 0.0
text 659412 659412 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 883332 883332 0 0.0
bss 89980 89980 0 0.0
text 602858 602860 2 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 875788 875788 0 0.0
bss 90444 90444 0 0.0
text 594368 594368 0 0.0

@yufengwangca yufengwangca merged commit bcd2c1e into project-chip:master Feb 23, 2023
lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
* [chip-tool] remove extra blank line in cert print

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants