Skip to content

Commit f2e397f

Browse files
tpambortpambor
committed
tests: mcumgr: Improve compatibility with 64-bit platforms
Use %zu format specifier for size_t type to ensure compatibility with both 32-bit and 64-bit platforms. Signed-off-by: Tim Pambor <[email protected]>
1 parent 3d5e9cd commit f2e397f

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ZTEST(os_mgmt_echo, test_echo)
5656
smp_dummy_disable();
5757

5858
zassert_equal(sizeof(expected_response), nb->len,
59-
"Expected to receive %d bytes but got %d\n", sizeof(expected_response),
59+
"Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
6060
nb->len);
6161

6262
zassert_mem_equal(expected_response, nb->data, nb->len,

‎tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ ZTEST(os_mgmt_info_build_date, test_info_build_date_1_build_date)
124124
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
125125

126126
zassert_equal(strlen(test_date_time), output.len,
127-
"Expected to receive %d bytes but got %d\n",
127+
"Expected to receive %zu bytes but got %zu\n",
128128
strlen(test_date_time), output.len);
129129

130130
/* Check left and right sides of date which should match */
@@ -201,7 +201,7 @@ ZTEST(os_mgmt_info_build_date, test_info_build_date_2_all)
201201

202202
zassert_equal((strlen(test_date_time) + strlen(response_all_left) +
203203
strlen(response_all_right)), output.len,
204-
"Expected to receive %d bytes but got %d\n",
204+
"Expected to receive %zu bytes but got %zu\n",
205205
(strlen(test_date_time) + strlen(response_all_left) +
206206
strlen(response_all_right)), output.len);
207207

‎tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ZTEST(os_mgmt_info_limited, test_info_1_kernel_name)
8989
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
9090

9191
zassert_equal((sizeof(response_kernel_name) - 1), output.len,
92-
"Expected to receive %d bytes but got %d\n",
92+
"Expected to receive %zu bytes but got %zu\n",
9393
(sizeof(response_kernel_name) - 1), output.len);
9494

9595
zassert_mem_equal(response_kernel_name, output.value, output.len,
@@ -160,7 +160,7 @@ ZTEST(os_mgmt_info_limited, test_info_2_all)
160160

161161
zassert_true(ok, "Expected decode to be successful\n");
162162
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
163-
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
163+
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
164164
zassert_equal(rc, MGMT_ERR_EMSGSIZE, "Expected to receive EMSGSIZE error but got %d\n",
165165
rc);
166166
}

‎tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ ZTEST(os_mgmt_info, test_info_1)
233233
smp_dummy_disable();
234234

235235
zassert_equal(sizeof(expected_response), nb->len,
236-
"Expected to receive %d bytes but got %d\n", sizeof(expected_response),
236+
"Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
237237
nb->len);
238238

239239
zassert_mem_equal(expected_response, nb->data, nb->len,
@@ -271,7 +271,7 @@ ZTEST(os_mgmt_info, test_info_1)
271271
smp_dummy_disable();
272272

273273
zassert_equal(sizeof(expected_response), nb->len,
274-
"Expected to receive %d bytes but got %d\n", sizeof(expected_response),
274+
"Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
275275
nb->len);
276276

277277
zassert_mem_equal(expected_response, nb->data, nb->len,
@@ -332,7 +332,7 @@ ZTEST(os_mgmt_info, test_info_2_kernel_name)
332332
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
333333

334334
zassert_equal((sizeof(response_kernel_name) - 1), output.len,
335-
"Expected to receive %d bytes but got %d\n",
335+
"Expected to receive %zu bytes but got %zu\n",
336336
(sizeof(response_kernel_name) - 1), output.len);
337337

338338
zassert_mem_equal(response_kernel_name, output.value, output.len,
@@ -393,7 +393,7 @@ ZTEST(os_mgmt_info, test_info_3_node_name)
393393
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
394394

395395
zassert_equal((sizeof(response_node_name) - 1), output.len,
396-
"Expected to receive %d bytes but got %d\n",
396+
"Expected to receive %zu bytes but got %zu\n",
397397
(sizeof(response_node_name) - 1), output.len);
398398

399399
zassert_mem_equal(response_node_name, output.value, output.len,
@@ -455,7 +455,7 @@ ZTEST(os_mgmt_info, test_info_4_kernel_release)
455455
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
456456

457457
zassert_equal((sizeof(response_kernel_release) - 1), output.len,
458-
"Expected to receive %d bytes but got %d\n",
458+
"Expected to receive %zu bytes but got %zu\n",
459459
(sizeof(response_kernel_release) - 1), output.len);
460460

461461
zassert_mem_equal(response_kernel_release, output.value, output.len,
@@ -517,7 +517,7 @@ ZTEST(os_mgmt_info, test_info_5_kernel_version)
517517
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
518518

519519
zassert_equal((sizeof(response_kernel_version) - 1), output.len,
520-
"Expected to receive %d bytes but got %d\n",
520+
"Expected to receive %zu bytes but got %zu\n",
521521
(sizeof(response_kernel_version) - 1), output.len);
522522

523523
zassert_mem_equal(response_kernel_version, output.value, output.len,
@@ -578,8 +578,8 @@ ZTEST(os_mgmt_info, test_info_6_machine)
578578
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
579579

580580
zassert_equal((sizeof(response_machine) - 1), output.len,
581-
"Expected to receive %d bytes but got %d\n", (sizeof(response_machine) - 1),
582-
output.len);
581+
"Expected to receive %zu bytes but got %zu\n",
582+
(sizeof(response_machine) - 1), output.len);
583583

584584
zassert_mem_equal(response_machine, output.value, output.len,
585585
"Expected received data mismatch");
@@ -639,8 +639,8 @@ ZTEST(os_mgmt_info, test_info_7_processor)
639639
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
640640

641641
zassert_equal((sizeof(response_processor) - 1), output.len,
642-
"Expected to receive %d bytes but got %d\n", (sizeof(response_processor) - 1),
643-
output.len);
642+
"Expected to receive %zu bytes but got %zu\n",
643+
(sizeof(response_processor) - 1), output.len);
644644

645645
zassert_mem_equal(response_processor, output.value, output.len,
646646
"Expected received data mismatch");
@@ -700,7 +700,7 @@ ZTEST(os_mgmt_info, test_info_8_platform)
700700
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
701701

702702
zassert_equal((sizeof(response_board_target) - 1), output.len,
703-
"Expected to receive %d bytes but got %d\n",
703+
"Expected to receive %zu bytes but got %zu\n",
704704
(sizeof(response_board_target) - 1), output.len);
705705

706706
zassert_mem_equal(response_board_target, output.value, output.len,
@@ -761,7 +761,7 @@ ZTEST(os_mgmt_info, test_info_9_os)
761761
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
762762

763763
zassert_equal((sizeof(response_os) - 1), output.len,
764-
"Expected to receive %d bytes but got %d\n", (sizeof(response_os) - 1),
764+
"Expected to receive %zu bytes but got %zu\n", (sizeof(response_os) - 1),
765765
output.len);
766766

767767
zassert_mem_equal(response_os, output.value, output.len,
@@ -822,7 +822,7 @@ ZTEST(os_mgmt_info, test_info_10_all)
822822
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
823823

824824
zassert_equal((sizeof(response_all) - 1), output.len,
825-
"Expected to receive %d bytes but got %d\n",
825+
"Expected to receive %zu bytes but got %zu\n",
826826
(sizeof(response_all) - 1), output.len);
827827

828828
zassert_mem_equal(response_all, output.value, output.len,
@@ -888,7 +888,7 @@ ZTEST(os_mgmt_info, test_info_11_multi_1)
888888
/* Construct expected response to be compared against */
889889
sprintf(buffer, "%s %s %s", response_kernel_release, response_processor, response_os);
890890

891-
zassert_equal(strlen(buffer), output.len, "Expected to receive %d bytes but got %d\n",
891+
zassert_equal(strlen(buffer), output.len, "Expected to receive %zu bytes but got %zu\n",
892892
strlen(buffer), output.len);
893893

894894
zassert_mem_equal(buffer, output.value, output.len, "Expected received data mismatch");
@@ -955,7 +955,7 @@ ZTEST(os_mgmt_info, test_info_12_multi_2)
955955
*/
956956
sprintf(buffer, "%s %s", response_node_name, response_kernel_version);
957957

958-
zassert_equal(strlen(buffer), output.len, "Expected to receive %d bytes but got %d\n",
958+
zassert_equal(strlen(buffer), output.len, "Expected to receive %zu bytes but got %zu\n",
959959
strlen(buffer), output.len);
960960

961961
zassert_mem_equal(buffer, output.value, output.len, "Expected received data mismatch");
@@ -1028,7 +1028,7 @@ ZTEST(os_mgmt_info, test_info_13_invalid_1)
10281028

10291029
zassert_true(ok, "Expected decode to be successful\n");
10301030
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
1031-
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
1031+
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
10321032
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
10331033
}
10341034

@@ -1099,7 +1099,7 @@ ZTEST(os_mgmt_info, test_info_14_invalid_2)
10991099

11001100
zassert_true(ok, "Expected decode to be successful\n");
11011101
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
1102-
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
1102+
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
11031103
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
11041104
}
11051105

@@ -1171,7 +1171,7 @@ ZTEST(os_mgmt_info_custom_os, test_info_os_custom)
11711171
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
11721172

11731173
zassert_equal((sizeof(response_os_custom) - 1), output.len,
1174-
"Expected to receive %d bytes but got %d\n",
1174+
"Expected to receive %zu bytes but got %zu\n",
11751175
(sizeof(response_os_custom) - 1), output.len);
11761176

11771177
zassert_mem_equal(response_os_custom, output.value, output.len,
@@ -1232,7 +1232,7 @@ ZTEST(os_mgmt_info_custom_os_disabled, test_info_os_custom_disabled)
12321232
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
12331233

12341234
zassert_equal((sizeof(response_os) - 1), output.len,
1235-
"Expected to receive %d bytes but got %d\n",
1235+
"Expected to receive %zu bytes but got %zu\n",
12361236
(sizeof(response_os) - 1), output.len);
12371237

12381238
zassert_mem_equal(response_os, output.value, output.len,
@@ -1305,7 +1305,7 @@ ZTEST(os_mgmt_info_custom_cmd, test_info_cmd_custom)
13051305
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
13061306

13071307
zassert_equal((sizeof(response_custom_cmd) - 1), output.len,
1308-
"Expected to receive %d bytes but got %d\n",
1308+
"Expected to receive %zu bytes but got %zu\n",
13091309
(sizeof(response_custom_cmd) - 1), output.len);
13101310

13111311
zassert_mem_equal(response_custom_cmd, output.value, output.len,
@@ -1376,7 +1376,7 @@ ZTEST(os_mgmt_info_custom_cmd_disabled, test_info_cmd_custom_disabled)
13761376
zassert_true(ok, "Expected decode to be successful\n");
13771377
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
13781378

1379-
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
1379+
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
13801380

13811381
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
13821382
}
@@ -1445,7 +1445,7 @@ ZTEST(os_mgmt_info_custom_cmd_disabled_verify, test_info_cmd_custom_disabled)
14451445
zassert_true(ok, "Expected decode to be successful\n");
14461446
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
14471447

1448-
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
1448+
zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
14491449

14501450
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
14511451

0 commit comments

Comments
 (0)