Skip to content

Commit 9002db0

Browse files
nordicjmhenrikbrixandersen
nordicjm
authored and
henrikbrixandersen
committed
tests: mgmt: mcumgr: os_mgmt_info: Update to use board target
Uses the newly changed board target for the hardware platform Signed-off-by: Jamie McCrae <[email protected]>
1 parent b2884ff commit 9002db0

File tree

2 files changed

+27
-87
lines changed

2 files changed

+27
-87
lines changed

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

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ static struct net_buf *nb;
3131

3232
/* Responses to commands */
3333
extern uint8_t *test_date_time;
34-
const uint8_t response_all_board_revision_left[] = "Zephyr unknown " STRINGIFY(BUILD_VERSION) " "
35-
KERNEL_VERSION_STRING " ";
36-
const uint8_t response_all_board_revision_right[] = " " CONFIG_ARCH " " PROCESSOR_NAME " "
37-
CONFIG_BOARD "@" CONFIG_BOARD_REVISION
38-
" Zephyr";
3934
const uint8_t response_all_left[] = "Zephyr unknown " STRINGIFY(BUILD_VERSION) " "
4035
KERNEL_VERSION_STRING " ";
41-
const uint8_t response_all_right[] = " " CONFIG_ARCH " " PROCESSOR_NAME " " CONFIG_BOARD " Zephyr";
42-
36+
const uint8_t response_all_right[] = " " CONFIG_ARCH " " PROCESSOR_NAME " " CONFIG_BOARD_TARGET
37+
" Zephyr";
4338
const uint8_t query_build_date[] = "b";
4439
const uint8_t query_all[] = "a";
4540

@@ -204,36 +199,17 @@ ZTEST(os_mgmt_info_build_date, test_info_build_date_2_all)
204199
zassert_true(ok, "Expected decode to be successful\n");
205200
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
206201

207-
if (sizeof(CONFIG_BOARD_REVISION) > 1) {
208-
/* Check with board revision */
209-
zassert_equal((strlen(test_date_time) + strlen(response_all_board_revision_left) +
210-
strlen(response_all_board_revision_right)), output.len,
211-
"Expected to receive %d bytes but got %d\n",
212-
(strlen(test_date_time) + strlen(response_all_board_revision_left) +
213-
strlen(response_all_board_revision_right)), output.len);
214-
215-
zassert_mem_equal(response_all_board_revision_left, output.value,
216-
strlen(response_all_board_revision_left),
217-
"Expected received data mismatch");
218-
zassert_mem_equal(response_all_board_revision_right,
219-
&output.value[strlen(response_all_board_revision_left) +
220-
strlen(test_date_time)],
221-
strlen(response_all_board_revision_right),
222-
"Expected received data mismatch");
223-
} else {
224-
/* Check without board revision */
225-
zassert_equal((strlen(test_date_time) + strlen(response_all_left) +
226-
strlen(response_all_right)), output.len,
227-
"Expected to receive %d bytes but got %d\n",
228-
(strlen(test_date_time) + strlen(response_all_left) +
229-
strlen(response_all_right)), output.len);
230-
231-
zassert_mem_equal(response_all_left, output.value, strlen(response_all_left),
232-
"Expected received data mismatch");
233-
zassert_mem_equal(response_all_right, &output.value[strlen(response_all_left) +
234-
strlen(test_date_time)], strlen(response_all_right),
235-
"Expected received data mismatch");
236-
}
202+
zassert_equal((strlen(test_date_time) + strlen(response_all_left) +
203+
strlen(response_all_right)), output.len,
204+
"Expected to receive %d bytes but got %d\n",
205+
(strlen(test_date_time) + strlen(response_all_left) +
206+
strlen(response_all_right)), output.len);
207+
208+
zassert_mem_equal(response_all_left, output.value, strlen(response_all_left),
209+
"Expected received data mismatch");
210+
zassert_mem_equal(response_all_right, &output.value[strlen(response_all_left) +
211+
strlen(test_date_time)], strlen(response_all_right),
212+
"Expected received data mismatch");
237213

238214
/* Extract time strings into timestamps */
239215
expected_time_seconds = time_string_to_seconds(&test_date_time[TIME_CHECK_HH_START_CHAR]);

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

Lines changed: 14 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,11 @@ const uint8_t response_kernel_release[] = STRINGIFY(BUILD_VERSION);
8282
const uint8_t response_kernel_version[] = KERNEL_VERSION_STRING;
8383
const uint8_t response_machine[] = CONFIG_ARCH;
8484
const uint8_t response_processor[] = PROCESSOR_NAME;
85-
const uint8_t response_board_revision[] = CONFIG_BOARD "@" CONFIG_BOARD_REVISION;
86-
const uint8_t response_board[] = CONFIG_BOARD;
85+
const uint8_t response_board_target[] = CONFIG_BOARD_TARGET;
8786
const uint8_t response_os[] = "Zephyr";
8887
const uint8_t response_custom_cmd[] = "Magic Output for Test";
8988
const uint8_t response_os_custom[] = CONFIG_CUSTOM_OS_NAME_VALUE;
9089

91-
const uint8_t response_all_board_revision[] = "Zephyr "
92-
#if defined(CONFIG_BT)
93-
CONFIG_BT_DEVICE_NAME
94-
#elif defined(CONFIG_NET_HOSTNAME_ENABLE)
95-
CONFIG_NET_HOSTNAME
96-
#else
97-
"unknown"
98-
#endif
99-
" " STRINGIFY(BUILD_VERSION) " "
100-
KERNEL_VERSION_STRING " " CONFIG_ARCH " "
101-
PROCESSOR_NAME " " CONFIG_BOARD "@"
102-
CONFIG_BOARD_REVISION " Zephyr";
103-
10490
const uint8_t response_all[] = "Zephyr "
10591
#if defined(CONFIG_BT)
10692
CONFIG_BT_DEVICE_NAME
@@ -110,7 +96,7 @@ const uint8_t response_all[] = "Zephyr "
11096
"unknown"
11197
#endif
11298
" " STRINGIFY(BUILD_VERSION) " " KERNEL_VERSION_STRING " "
113-
CONFIG_ARCH " " PROCESSOR_NAME " " CONFIG_BOARD " Zephyr";
99+
CONFIG_ARCH " " PROCESSOR_NAME " " CONFIG_BOARD_TARGET " Zephyr";
114100

115101
const uint8_t query_kernel_name[] = "s";
116102
const uint8_t query_node_name[] = "n";
@@ -713,23 +699,12 @@ ZTEST(os_mgmt_info, test_info_8_platform)
713699
zassert_true(ok, "Expected decode to be successful\n");
714700
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
715701

716-
if (sizeof(CONFIG_BOARD_REVISION) > 1) {
717-
/* Check with board revision */
718-
zassert_equal((sizeof(response_board_revision) - 1), output.len,
719-
"Expected to receive %d bytes but got %d\n",
720-
(sizeof(response_board_revision) - 1), output.len);
721-
722-
zassert_mem_equal(response_board_revision, output.value, output.len,
723-
"Expected received data mismatch");
724-
} else {
725-
/* Check without board revision */
726-
zassert_equal((sizeof(response_board) - 1), output.len,
727-
"Expected to receive %d bytes but got %d\n",
728-
(sizeof(response_board) - 1), output.len);
729-
730-
zassert_mem_equal(response_board, output.value, output.len,
731-
"Expected received data mismatch");
732-
}
702+
zassert_equal((sizeof(response_board_target) - 1), output.len,
703+
"Expected to receive %d bytes but got %d\n",
704+
(sizeof(response_board_target) - 1), output.len);
705+
706+
zassert_mem_equal(response_board_target, output.value, output.len,
707+
"Expected received data mismatch");
733708
}
734709

735710
ZTEST(os_mgmt_info, test_info_9_os)
@@ -846,23 +821,12 @@ ZTEST(os_mgmt_info, test_info_10_all)
846821
zassert_true(ok, "Expected decode to be successful\n");
847822
zassert_equal(decoded, 1, "Expected to receive 1 decoded zcbor element\n");
848823

849-
if (sizeof(CONFIG_BOARD_REVISION) > 1) {
850-
/* Check with board revision */
851-
zassert_equal((sizeof(response_all_board_revision) - 1), output.len,
852-
"Expected to receive %d bytes but got %d\n",
853-
(sizeof(response_all_board_revision) - 1), output.len);
854-
855-
zassert_mem_equal(response_all_board_revision, output.value, output.len,
856-
"Expected received data mismatch");
857-
} else {
858-
/* Check without board revision */
859-
zassert_equal((sizeof(response_all) - 1), output.len,
860-
"Expected to receive %d bytes but got %d\n",
861-
(sizeof(response_all) - 1), output.len);
862-
863-
zassert_mem_equal(response_all, output.value, output.len,
864-
"Expected received data mismatch");
865-
}
824+
zassert_equal((sizeof(response_all) - 1), output.len,
825+
"Expected to receive %d bytes but got %d\n",
826+
(sizeof(response_all) - 1), output.len);
827+
828+
zassert_mem_equal(response_all, output.value, output.len,
829+
"Expected received data mismatch");
866830
}
867831

868832
ZTEST(os_mgmt_info, test_info_11_multi_1)

0 commit comments

Comments
 (0)