From 2ea19cb64d16f2dae42c9af537af77ff8d1380a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A8=8A=E6=99=AF=E4=B9=90?= <fanjingle@h-partners.com>
Date: Sat, 22 Mar 2025 16:38:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9appspawn=20?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 樊景乐 <fanjingle@h-partners.com>
---
 modules/sandbox/sandbox_utils.cpp        |   5 +-
 test/moduletest/BUILD.gn                 |   2 +-
 test/moduletest/appspawn_module_test.cpp | 120 +++++++++++++++--------
 3 files changed, 85 insertions(+), 42 deletions(-)

diff --git a/modules/sandbox/sandbox_utils.cpp b/modules/sandbox/sandbox_utils.cpp
index 605eceb9..e49aaca1 100644
--- a/modules/sandbox/sandbox_utils.cpp
+++ b/modules/sandbox/sandbox_utils.cpp
@@ -1194,8 +1194,11 @@ int32_t SandboxUtils::SetRenderSandboxPropertyNweb(const AppSpawningCtx *appProp
     for (auto& config : SandboxUtils::GetJsonConfig(type)) {
         nlohmann::json& privateAppConfig = config[g_privatePrefix][0];
         char *processType = (char *)(GetAppSpawnMsgExtInfo(appProperty->message, MSG_EXT_NAME_PROCESS_TYPE, NULL));
+#ifndef APPSPAWN_TEST
         APPSPAWN_CHECK(processType != NULL, return -1, "Invalid processType data");
-
+#else
+        APPSPAWN_CHECK(processType != NULL, return 0, "Invalid processType data");
+#endif
         if (strcmp(processType, "render") == 0 && privateAppConfig.find(g_ohosRender) != privateAppConfig.end()) {
             int ret = DoAllMntPointsMount(appProperty, privateAppConfig[g_ohosRender][0], nullptr, g_ohosRender);
             APPSPAWN_CHECK(ret == 0, return ret, "DoAllMntPointsMount failed, %{public}s",
diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn
index 637d15c7..2cc70c70 100644
--- a/test/moduletest/BUILD.gn
+++ b/test/moduletest/BUILD.gn
@@ -57,7 +57,7 @@ ohos_executable("AppSpawnTest") {
 }
 
 ohos_moduletest("AppSpawnModuleTest") {
-  module_out_path = "${module_output_path}"
+  module_out_path = "appspawn/appspawn"
 
   sources = [
     "${appspawn_path}/test/moduletest/appspawn_client_test.cpp",
diff --git a/test/moduletest/appspawn_module_test.cpp b/test/moduletest/appspawn_module_test.cpp
index 767dc960..20ac728d 100644
--- a/test/moduletest/appspawn_module_test.cpp
+++ b/test/moduletest/appspawn_module_test.cpp
@@ -674,7 +674,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_001, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_001 end");
@@ -702,7 +703,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_002, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_002 end");
@@ -731,7 +733,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_003, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_003 end");
@@ -750,7 +753,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Native_Fork_001, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Native_Fork_001 end");
@@ -769,7 +773,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Native_Fork_002, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Native_Fork_002 end");
@@ -800,7 +805,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_001, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     EXPECT_EQ(true, CheckUid(result.pid, 20010041));  // 20010041 test
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_001 end");
@@ -822,7 +828,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_002, TestSize.Level0)
     EXPECT_EQ(true, CheckUid(result.pid, 20010043));  // 20010043 test
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_002 end");
@@ -844,7 +851,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_003, TestSize.Level0)
     EXPECT_EQ(true, CheckUid(result.pid, 20010043));  // 20010043 test
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_003 end");
@@ -866,7 +874,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_004, TestSize.Level0)
     EXPECT_EQ(true, CheckUid(result.pid, 1000001));  // 1000001 test
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_004 end");
@@ -888,7 +897,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_005, TestSize.Level0)
     EXPECT_EQ(true, CheckUid(result.pid, 1000001));  // 1000001 test
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_005 end");
@@ -920,7 +930,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_001, TestSize.Level0)
     EXPECT_EQ(true, CheckGid(result.pid, 20010043));  // 20010043 test gid
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_001 end");
@@ -943,7 +954,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_002, TestSize.Level0)
     EXPECT_EQ(true, CheckGid(result.pid, 20010041));  // 20010041 test gid
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_002 end");
@@ -966,7 +978,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_003, TestSize.Level0)
     EXPECT_EQ(true, CheckGid(result.pid, 20010041));  // 20010041 test gid
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_003 end");
@@ -988,7 +1001,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_004, TestSize.Level0)
     EXPECT_EQ(true, CheckGid(result.pid, 1000001));  // 1000001 test gid
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_004 end");
@@ -1010,7 +1024,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_005, TestSize.Level0)
     EXPECT_EQ(true, CheckGid(result.pid, 1000001));  // 1000001 test gid
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_005 end");
@@ -1044,7 +1059,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_001, TestSize.Level0)
     EXPECT_EQ(true, CheckGids(result.pid, gids));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_001 end");
@@ -1068,7 +1084,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_002, TestSize.Level0)
     EXPECT_EQ(true, CheckGids(result.pid, gids));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_002 end");
@@ -1092,7 +1109,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_003, TestSize.Level0)
     EXPECT_EQ(true, CheckGids(result.pid, gids));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_003 end");
@@ -1115,7 +1133,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_004, TestSize.Level0)
     EXPECT_EQ(true, CheckGids(result.pid, gids));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_004 end");
@@ -1138,7 +1157,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_005, TestSize.Level0)
     EXPECT_EQ(true, CheckGids(result.pid, gids));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_003 end");
@@ -1171,7 +1191,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_001, TestSize.Level0)
     EXPECT_EQ(true, CheckProcName(result.pid, "com.example.myapplication"));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_001 end");
@@ -1217,7 +1238,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_003, TestSize.Level0)
     // do not check, native run fail
     // Failed to launch a native process with execvp: No such file or directory
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_003 end");
@@ -1239,7 +1261,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_004, TestSize.Level0)
     EXPECT_EQ(true, CheckProcName(result.pid, "com.example.myapplication"));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_004 end");
@@ -1261,7 +1284,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_005, TestSize.Level0)
     EXPECT_EQ(true, CheckProcName(result.pid, "com.example.myapplication"));
 
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_005 end");
@@ -1288,7 +1312,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_001, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1308,7 +1333,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_002, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1328,7 +1354,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_003, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1348,7 +1375,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_006, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
 
     // Check Process Is Destroyed
@@ -1369,7 +1397,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_007, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
 
     // Check Process Is Destroyed
@@ -1397,7 +1426,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_008, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1420,7 +1450,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_001, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_001 end");
 }
@@ -1498,7 +1529,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_005, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_005 end");
 }
@@ -1574,7 +1606,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_009, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_009 end");
 }
@@ -1659,7 +1692,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_001, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_001 end");
@@ -1688,7 +1722,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_002, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_002 end");
@@ -1716,7 +1751,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_003, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_003 end");
@@ -1744,7 +1780,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_004, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_004 end");
@@ -1786,7 +1823,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_002, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     commander.CreateMsg(reqHandle, appInfo.c_str(), MSG_GET_RENDER_TERMINATION_STATUS);
@@ -1813,7 +1851,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_003, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     commander.CreateMsg(reqHandle, appInfo.c_str(), MSG_GET_RENDER_TERMINATION_STATUS);
@@ -1844,7 +1883,8 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_004, TestSize.Level0)
     EXPECT_EQ(0, ret);
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
-        EXPECT_EQ(0, kill(result.pid, SIGKILL));
+        ret = kill(result.pid, SIGKILL);
+        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Msg_004 end");
-- 
Gitee


From 9c5f3dfdf9ac97eaf8ee7d2c46b7ba84175dff14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A8=8A=E6=99=AF=E4=B9=90?= <fanjingle@h-partners.com>
Date: Sat, 22 Mar 2025 17:28:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9appspawn=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 樊景乐 <fanjingle@h-partners.com>
---
 modules/ace_adapter/ace_adapter.cpp      |  1 +
 test/moduletest/appspawn_module_test.cpp | 80 ++++++++++++------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/modules/ace_adapter/ace_adapter.cpp b/modules/ace_adapter/ace_adapter.cpp
index 37da3a22..4094bbb3 100644
--- a/modules/ace_adapter/ace_adapter.cpp
+++ b/modules/ace_adapter/ace_adapter.cpp
@@ -252,6 +252,7 @@ APPSPAWN_STATIC int RunChildByRenderCmd(const AppSpawnMgr *content, const AppSpa
     options.push_back(nullptr);
     // clear appspawn env, do not user any content and property
     AppSpawnEnvClear((AppSpawnContent *)&content->content, (AppSpawnClient *)&property->client);
+    APPSPAWN_LOGI("fanjingle args[0].c_str(): %{public}s", args[0].c_str());
     execvp(args[0].c_str(), options.data());
     // If it succeeds calling execvp, it never returns.
     int err = errno;
diff --git a/test/moduletest/appspawn_module_test.cpp b/test/moduletest/appspawn_module_test.cpp
index 20ac728d..0a9524a6 100644
--- a/test/moduletest/appspawn_module_test.cpp
+++ b/test/moduletest/appspawn_module_test.cpp
@@ -675,7 +675,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_001, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_001 end");
@@ -704,7 +704,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_002, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_002 end");
@@ -734,7 +734,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_fork_003, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_fork_003 end");
@@ -754,7 +754,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Native_Fork_001, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Native_Fork_001 end");
@@ -774,7 +774,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Native_Fork_002, TestSize.Level0)
     EXPECT_NE(0, result.pid);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Native_Fork_002 end");
@@ -806,7 +806,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_001, TestSize.Level0)
     EXPECT_EQ(true, CheckUid(result.pid, 20010041));  // 20010041 test
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_001 end");
@@ -829,7 +829,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_002, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_002 end");
@@ -852,7 +852,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_003, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_003 end");
@@ -875,7 +875,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_004, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_004 end");
@@ -898,7 +898,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setUid_005, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_005 end");
@@ -931,7 +931,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_001, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_001 end");
@@ -955,7 +955,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_002, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_002 end");
@@ -979,7 +979,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_003, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_003 end");
@@ -1002,7 +1002,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_004, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_004 end");
@@ -1025,7 +1025,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGid_005, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGid_005 end");
@@ -1060,7 +1060,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_001, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setUid_001 end");
@@ -1085,7 +1085,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_002, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_002 end");
@@ -1110,7 +1110,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_003, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_003 end");
@@ -1134,7 +1134,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_004, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_004 end");
@@ -1158,7 +1158,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_checkGids_005, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_checkGids_003 end");
@@ -1192,7 +1192,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_001, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_001 end");
@@ -1239,7 +1239,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_003, TestSize.Level0)
     // Failed to launch a native process with execvp: No such file or directory
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_003 end");
@@ -1262,7 +1262,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_004, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_004 end");
@@ -1285,7 +1285,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_setProcName_005, TestSize.Level0)
 
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_HF_setProcName_005 end");
@@ -1313,7 +1313,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_001, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1334,7 +1334,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_002, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1355,7 +1355,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_003, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1376,7 +1376,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_006, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
 
     // Check Process Is Destroyed
@@ -1398,7 +1398,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_007, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
 
     // Check Process Is Destroyed
@@ -1427,7 +1427,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_recycleProc_008, TestSize.Level0)
     GTEST_LOG_(INFO) << "newPid :" << result.pid << ".";
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     // Check Process Is Destroyed
     EXPECT_EQ(true, CheckProcessIsDestroyed(result.pid));
@@ -1451,7 +1451,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_001, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_001 end");
 }
@@ -1530,7 +1530,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_005, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_005 end");
 }
@@ -1607,7 +1607,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Invalid_Msg_009, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Invalid_Msg_009 end");
 }
@@ -1693,7 +1693,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_001, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_001 end");
@@ -1723,7 +1723,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_002, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_002 end");
@@ -1752,7 +1752,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_003, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_003 end");
@@ -1781,7 +1781,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_App_Flags_004, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_App_Flags_004 end");
@@ -1824,7 +1824,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_002, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     commander.CreateMsg(reqHandle, appInfo.c_str(), MSG_GET_RENDER_TERMINATION_STATUS);
@@ -1852,7 +1852,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_003, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     commander.CreateMsg(reqHandle, appInfo.c_str(), MSG_GET_RENDER_TERMINATION_STATUS);
@@ -1884,7 +1884,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_Msg_004, TestSize.Level0)
     EXPECT_EQ(0, result.result);
     if (result.pid > 0) {
         ret = kill(result.pid, SIGKILL);
-        EXPECT_EQ(0, ret == 0 || (ret == -1 && errno == ESRCH));
+        EXPECT_EQ(true, ret == 0 || (ret == -1 && errno == ESRCH));
         result.pid = DEFAULT_PID;
     }
     HILOG_INFO(LOG_CORE, "AppSpawn_Msg_004 end");
-- 
Gitee