RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00
Code Releases Activity

shell_lock: don't set CONFIG_SHELL_SHUTDOWN_ON_EXIT

Browse Source
This commit is contained in:
Benjamin Valentin 2023-02-10 13:54:57 +01:00 committed by Benjamin Valentin
parent 84a3078a93
commit f58384832c
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/include/shell.h
View File

@ -50,7 +50,7 @@ extern "C" {
* Instead terminate RIOT, which is also the behavior a user would * Instead terminate RIOT, which is also the behavior a user would
* expect from a CLI application. * expect from a CLI application.
*/ */
# if defined(CPU_NATIVE) # if defined(CPU_NATIVE) && !IS_ACTIVE(MODULE_SHELL_LOCK)
# define CONFIG_SHELL_SHUTDOWN_ON_EXIT 1 # define CONFIG_SHELL_SHUTDOWN_ON_EXIT 1
# else # else
# define CONFIG_SHELL_SHUTDOWN_ON_EXIT 0 # define CONFIG_SHELL_SHUTDOWN_ON_EXIT 0

4
tests/sys/shell_lock/Makefile
View File

@ -12,10 +12,6 @@ CFLAGS += -DCONFIG_SHELL_LOCK_PASSWORD=\"password\"
CFLAGS += -DCONFIG_SHELL_LOCK_AUTO_LOCK_TIMEOUT_MS=7000 CFLAGS += -DCONFIG_SHELL_LOCK_AUTO_LOCK_TIMEOUT_MS=7000
endif endif
# This config defaults to 1 on native, such that pm_off() would be called as soon as
# shell_run_once is terminated in shell_run_forever. We do not want this behavior for this test.
CFLAGS += -DCONFIG_SHELL_SHUTDOWN_ON_EXIT=0
# test_utils_interactive_sync_shell assumes that the prompt is always '> ' which breaks # test_utils_interactive_sync_shell assumes that the prompt is always '> ' which breaks
# with the password prompt of the shell_lock module which is different from the shell's prompt # with the password prompt of the shell_lock module which is different from the shell's prompt
DISABLE_MODULE += test_utils_interactive_sync_shell DISABLE_MODULE += test_utils_interactive_sync_shell