Skip to content

Commit

Permalink
tests: fix tests for upmerge
Browse files Browse the repository at this point in the history
align tests for changes in upmerge

Signed-off-by: Robert Gałat <[email protected]>
  • Loading branch information
RobertGalatNordic committed May 24, 2024
1 parent 85a8ad6 commit c45fb28
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
&cpuapp_rram {
reg = < 0x0 DT_SIZE_K(1524) >;
};
1 change: 1 addition & 0 deletions tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_MINIMAL_LIBC=y

# Bootloader size optimization
CONFIG_NCS_BOOT_BANNER=n
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_dut_shell/mock/shell_mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

DEFINE_FFF_GLOBALS;

FAKE_VOID_FUNC_VARARG(shell_fprintf, const struct shell *, enum shell_vt100_color, const char *,
...);
FAKE_VOID_FUNC_VARARG(shell_fprintf_impl, const struct shell *, enum shell_vt100_color,
const char *, ...);

0 comments on commit c45fb28

Please sign in to comment.