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 <tim.pambor@codewrights.de>
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c b/tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c
index 9dde48c..038f717 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c
@@ -56,7 +56,7 @@
smp_dummy_disable();
zassert_equal(sizeof(expected_response), nb->len,
- "Expected to receive %d bytes but got %d\n", sizeof(expected_response),
+ "Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
nb->len);
zassert_mem_equal(expected_response, nb->data, nb->len,
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
index 011a0ab..d4ada2b 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
@@ -124,7 +124,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal(strlen(test_date_time), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
strlen(test_date_time), output.len);
/* Check left and right sides of date which should match */
@@ -201,7 +201,7 @@
zassert_equal((strlen(test_date_time) + strlen(response_all_left) +
strlen(response_all_right)), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(strlen(test_date_time) + strlen(response_all_left) +
strlen(response_all_right)), output.len);
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
index f9b6520..04edd89 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
@@ -89,7 +89,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_kernel_name) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_kernel_name) - 1), output.len);
zassert_mem_equal(response_kernel_name, output.value, output.len,
@@ -160,7 +160,7 @@
zassert_true(ok, "Expected decode to be successful\n");
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
- zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
+ zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
zassert_equal(rc, MGMT_ERR_EMSGSIZE, "Expected to receive EMSGSIZE error but got %d\n",
rc);
}
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
index 120bce7..f7c9ad9 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
@@ -233,7 +233,7 @@
smp_dummy_disable();
zassert_equal(sizeof(expected_response), nb->len,
- "Expected to receive %d bytes but got %d\n", sizeof(expected_response),
+ "Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
nb->len);
zassert_mem_equal(expected_response, nb->data, nb->len,
@@ -271,7 +271,7 @@
smp_dummy_disable();
zassert_equal(sizeof(expected_response), nb->len,
- "Expected to receive %d bytes but got %d\n", sizeof(expected_response),
+ "Expected to receive %zu bytes but got %d\n", sizeof(expected_response),
nb->len);
zassert_mem_equal(expected_response, nb->data, nb->len,
@@ -332,7 +332,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_kernel_name) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_kernel_name) - 1), output.len);
zassert_mem_equal(response_kernel_name, output.value, output.len,
@@ -393,7 +393,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_node_name) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_node_name) - 1), output.len);
zassert_mem_equal(response_node_name, output.value, output.len,
@@ -455,7 +455,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_kernel_release) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_kernel_release) - 1), output.len);
zassert_mem_equal(response_kernel_release, output.value, output.len,
@@ -517,7 +517,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_kernel_version) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_kernel_version) - 1), output.len);
zassert_mem_equal(response_kernel_version, output.value, output.len,
@@ -578,8 +578,8 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_machine) - 1), output.len,
- "Expected to receive %d bytes but got %d\n", (sizeof(response_machine) - 1),
- output.len);
+ "Expected to receive %zu bytes but got %zu\n",
+ (sizeof(response_machine) - 1), output.len);
zassert_mem_equal(response_machine, output.value, output.len,
"Expected received data mismatch");
@@ -639,8 +639,8 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_processor) - 1), output.len,
- "Expected to receive %d bytes but got %d\n", (sizeof(response_processor) - 1),
- output.len);
+ "Expected to receive %zu bytes but got %zu\n",
+ (sizeof(response_processor) - 1), output.len);
zassert_mem_equal(response_processor, output.value, output.len,
"Expected received data mismatch");
@@ -700,7 +700,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_board_target) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_board_target) - 1), output.len);
zassert_mem_equal(response_board_target, output.value, output.len,
@@ -761,7 +761,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_os) - 1), output.len,
- "Expected to receive %d bytes but got %d\n", (sizeof(response_os) - 1),
+ "Expected to receive %zu bytes but got %zu\n", (sizeof(response_os) - 1),
output.len);
zassert_mem_equal(response_os, output.value, output.len,
@@ -822,7 +822,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_all) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_all) - 1), output.len);
zassert_mem_equal(response_all, output.value, output.len,
@@ -888,7 +888,7 @@
/* Construct expected response to be compared against */
sprintf(buffer, "%s %s %s", response_kernel_release, response_processor, response_os);
- zassert_equal(strlen(buffer), output.len, "Expected to receive %d bytes but got %d\n",
+ zassert_equal(strlen(buffer), output.len, "Expected to receive %zu bytes but got %zu\n",
strlen(buffer), output.len);
zassert_mem_equal(buffer, output.value, output.len, "Expected received data mismatch");
@@ -955,7 +955,7 @@
*/
sprintf(buffer, "%s %s", response_node_name, response_kernel_version);
- zassert_equal(strlen(buffer), output.len, "Expected to receive %d bytes but got %d\n",
+ zassert_equal(strlen(buffer), output.len, "Expected to receive %zu bytes but got %zu\n",
strlen(buffer), output.len);
zassert_mem_equal(buffer, output.value, output.len, "Expected received data mismatch");
@@ -1028,7 +1028,7 @@
zassert_true(ok, "Expected decode to be successful\n");
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
- zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
+ zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
}
@@ -1099,7 +1099,7 @@
zassert_true(ok, "Expected decode to be successful\n");
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
- zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
+ zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
}
@@ -1171,7 +1171,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_os_custom) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_os_custom) - 1), output.len);
zassert_mem_equal(response_os_custom, output.value, output.len,
@@ -1232,7 +1232,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_os) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_os) - 1), output.len);
zassert_mem_equal(response_os, output.value, output.len,
@@ -1305,7 +1305,7 @@
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
zassert_equal((sizeof(response_custom_cmd) - 1), output.len,
- "Expected to receive %d bytes but got %d\n",
+ "Expected to receive %zu bytes but got %zu\n",
(sizeof(response_custom_cmd) - 1), output.len);
zassert_mem_equal(response_custom_cmd, output.value, output.len,
@@ -1376,7 +1376,7 @@
zassert_true(ok, "Expected decode to be successful\n");
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
- zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
+ zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
}
@@ -1445,7 +1445,7 @@
zassert_true(ok, "Expected decode to be successful\n");
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
- zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %d\n", output.len);
+ zassert_equal(output.len, 0, "Expected to receive 0 bytes but got %zu\n", output.len);
zassert_equal(rc, MGMT_ERR_EINVAL, "Expected to receive EINVAL error but got %d\n", rc);
