sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK

Browse Source 
Summary:

- Resolves an issue where `vfork_test` was not executed following
  the renaming from CONFIG_ARCH_HAVE_VFORK to CONFIG_ARCH_HAVE_FORK,
  as detailed in https://github.com/apache/nuttx/pull/9755.

Impact:
- Please merge https://github.com/apache/nuttx/pull/11200 before
  merging this PR.

Testing:
- Successfully tested with rv-virt:smp64, spresense:smp, and sim:smp.

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2023-08-13 20:14:34 +09:00 committed by Xiang Xiao
parent 144bf0bd1f
commit 79c7962af6
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interpreters/bas/Kconfig
View File

@ -72,7 +72,7 @@ config INTERPRETER_BAS_HAVE_FTRUNCATE
config EXAMPLES_BAS_SHELL config EXAMPLES_BAS_SHELL
bool "Shell support" bool "Shell support"
default n default n
depends on ARCH_HAVE_VFORK && EXPERIMENTAL depends on ARCH_HAVE_FORK && EXPERIMENTAL
select LIBC_EXECFUNCS select LIBC_EXECFUNCS
select SCHED_WAITPID select SCHED_WAITPID
---help--- ---help---

4
interpreters/bas/bas_statement.c
View File

@ -1051,7 +1051,7 @@ struct Value *stmt_DOcondition(struct Value *value)
struct Value *stmt_EDIT(struct Value *value) struct Value *stmt_EDIT(struct Value *value)
{ {
#if defined(CONFIG_EXAMPLES_BAS_EDITOR) && defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_VFORK) #if defined(CONFIG_EXAMPLES_BAS_EDITOR) && defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_FORK)
long int line; long int line;
struct Pc statementpc = g_pc; struct Pc statementpc = g_pc;
int status; int status;
@ -5674,7 +5674,7 @@ struct Value *stmt_SELECTCASE(struct Value *value)
struct Value *stmt_SHELL(struct Value *value) struct Value *stmt_SHELL(struct Value *value)
{ {
#if defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_VFORK) #if defined(CONFIG_EXAMPLES_BAS_SHELL) && defined(CONFIG_ARCH_HAVE_FORK)
pid_t pid; pid_t pid;
int status; int status;

2
testing/ostest/CMakeLists.txt
View File

@ -122,7 +122,7 @@ if(CONFIG_TESTING_OSTEST)
endif() endif()
endif() endif()
if(CONFIG_ARCH_HAVE_VFORK) if(CONFIG_ARCH_HAVE_FORK)
if(CONFIG_SCHED_WAITPID) if(CONFIG_SCHED_WAITPID)
list(APPEND SRCS vfork.c) list(APPEND SRCS vfork.c)
endif() endif()

2
testing/ostest/Makefile
View File

@ -123,7 +123,7 @@ CSRCS += sigev_thread.c
endif endif
endif endif
ifeq ($(CONFIG_ARCH_HAVE_VFORK),y) ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
ifeq ($(CONFIG_SCHED_WAITPID),y) ifeq ($(CONFIG_SCHED_WAITPID),y)
CSRCS += vfork.c CSRCS += vfork.c
endif endif

2
testing/ostest/ostest.h
View File

@ -256,7 +256,7 @@ void sched_lock_test(void);
/* vfork.c ******************************************************************/ /* vfork.c ******************************************************************/
#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) #if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)
int vfork_test(void); int vfork_test(void);
#endif #endif

2
testing/ostest/ostest_main.c
View File

@ -580,7 +580,7 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage(); check_test_memory_usage();
#endif #endif
#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) #if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)
printf("\nuser_main: vfork() test\n"); printf("\nuser_main: vfork() test\n");
vfork_test(); vfork_test();
#endif #endif

4
testing/ostest/vfork.c
View File

@ -33,7 +33,7 @@
#include "ostest.h" #include "ostest.h"
#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) #if defined(CONFIG_ARCH_HAVE_FORK) && defined(CONFIG_SCHED_WAITPID)
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -84,4 +84,4 @@ int vfork_test(void)
return 0; return 0;
} }
#endif /* CONFIG_ARCH_HAVE_VFORK && CONFIG_SCHED_WAITPID */ #endif /* CONFIG_ARCH_HAVE_FORK && CONFIG_SCHED_WAITPID */