From 31f1c00dbe83a5781ad7b09bf52d4b08098ae4f1 Mon Sep 17 00:00:00 2001
From: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
Date: Sun, 13 Aug 2023 20:14:34 +0900
Subject: [PATCH] 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 <Masayuki.Ishikawa@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 074fa477b9..db84d3d07b 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 482f94f62a..5172bdfb3a 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 84dddd799b..3aa8a67726 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 0dc4ac1a24..88dffd9288 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 0b692909e4..afc62b78a2 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 6635e2b37d..dbd28e4d56 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 65082c2263..5bfbd93dcf 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 */