You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/11/16 15:59:02 UTC
(nuttx-apps) branch master updated: apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 79c7962af apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK
79c7962af is described below
commit 79c7962af67dc14a40bc140cb3377e2c8e7b99e0
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Sun Aug 13 20:14:34 2023 +0900
apps: Replace CONFIG_ARCH_HAVE_VFORK with CONFIG_ARCH_HAVE_FORK
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 <Ma...@jp.sony.com>
---
interpreters/bas/Kconfig | 2 +-
interpreters/bas/bas_statement.c | 4 ++--
testing/ostest/CMakeLists.txt | 2 +-
testing/ostest/Makefile | 2 +-
testing/ostest/ostest.h | 2 +-
testing/ostest/ostest_main.c | 2 +-
testing/ostest/vfork.c | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/interpreters/bas/Kconfig b/interpreters/bas/Kconfig
index 074fa477b..db84d3d07 100644
--- a/interpreters/bas/Kconfig
+++ b/interpreters/bas/Kconfig
@@ -72,7 +72,7 @@ config INTERPRETER_BAS_HAVE_FTRUNCATE
config EXAMPLES_BAS_SHELL
bool "Shell support"
default n
- depends on ARCH_HAVE_VFORK && EXPERIMENTAL
+ depends on ARCH_HAVE_FORK && EXPERIMENTAL
select LIBC_EXECFUNCS
select SCHED_WAITPID
---help---
diff --git a/interpreters/bas/bas_statement.c b/interpreters/bas/bas_statement.c
index 482f94f62..5172bdfb3 100644
--- a/interpreters/bas/bas_statement.c
+++ b/interpreters/bas/bas_statement.c
@@ -1051,7 +1051,7 @@ struct Value *stmt_DOcondition(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;
struct Pc statementpc = g_pc;
int status;
@@ -5674,7 +5674,7 @@ struct Value *stmt_SELECTCASE(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;
int status;
diff --git a/testing/ostest/CMakeLists.txt b/testing/ostest/CMakeLists.txt
index 84dddd799..3aa8a6772 100644
--- a/testing/ostest/CMakeLists.txt
+++ b/testing/ostest/CMakeLists.txt
@@ -122,7 +122,7 @@ if(CONFIG_TESTING_OSTEST)
endif()
endif()
- if(CONFIG_ARCH_HAVE_VFORK)
+ if(CONFIG_ARCH_HAVE_FORK)
if(CONFIG_SCHED_WAITPID)
list(APPEND SRCS vfork.c)
endif()
diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile
index 0dc4ac1a2..88dffd928 100644
--- a/testing/ostest/Makefile
+++ b/testing/ostest/Makefile
@@ -123,7 +123,7 @@ CSRCS += sigev_thread.c
endif
endif
-ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
+ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
ifeq ($(CONFIG_SCHED_WAITPID),y)
CSRCS += vfork.c
endif
diff --git a/testing/ostest/ostest.h b/testing/ostest/ostest.h
index 0b692909e..afc62b78a 100644
--- a/testing/ostest/ostest.h
+++ b/testing/ostest/ostest.h
@@ -256,7 +256,7 @@ void sched_lock_test(void);
/* 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);
#endif
diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c
index 6635e2b37..dbd28e4d5 100644
--- a/testing/ostest/ostest_main.c
+++ b/testing/ostest/ostest_main.c
@@ -580,7 +580,7 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage();
#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");
vfork_test();
#endif
diff --git a/testing/ostest/vfork.c b/testing/ostest/vfork.c
index 65082c226..5bfbd93dc 100644
--- a/testing/ostest/vfork.c
+++ b/testing/ostest/vfork.c
@@ -33,7 +33,7 @@
#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
@@ -84,4 +84,4 @@ int vfork_test(void)
return 0;
}
-#endif /* CONFIG_ARCH_HAVE_VFORK && CONFIG_SCHED_WAITPID */
+#endif /* CONFIG_ARCH_HAVE_FORK && CONFIG_SCHED_WAITPID */