From 76076059fe98df3ef2e3592ba5c6139687c70fdc Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 23 May 2022 19:16:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9appspawn=20ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- common/appspawn_server.c | 2 ++ .../app_spawn_standard_test/app_spawn_standard_test.cpp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/appspawn_server.c b/common/appspawn_server.c index 775da70c..a03b5409 100644 --- a/common/appspawn_server.c +++ b/common/appspawn_server.c @@ -55,11 +55,13 @@ int DoStartApp(struct AppSpawnContent_ *content, AppSpawnClient *client, char *l APPSPAWN_CHECK(ret == 0, NotifyResToParent(content, client, ret); return ret, "Failed to setUidGid"); } +#ifndef APPSPAWN_TEST if (content->setFileDescriptors) { ret = content->setFileDescriptors(content, client); APPSPAWN_CHECK(ret == 0, NotifyResToParent(content, client, ret); return ret, "Failed to setFileDescriptors"); } +#endif if (content->setCapabilities) { ret = content->setCapabilities(content, client); APPSPAWN_CHECK(ret == 0, NotifyResToParent(content, client, ret); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp index e4c34524..8482a04c 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp @@ -85,9 +85,8 @@ HWTEST(AppSpawnStandardTest, App_Spawn_Standard_002, TestSize.Level0) pid_t pid = 100; AppSpawnContentExt* appSpawnContent = (AppSpawnContentExt*)malloc(sizeof(AppSpawnContentExt)); EXPECT_TRUE(appSpawnContent); - if (strcpy_s(appSpawnContent->content.longProcName, longProcNameLen, longProcName.c_str()) != 0) { - GTEST_LOG_(INFO) << "strcpy_s failed"; - }; + + appSpawnContent->content.longProcName = reinterpret_castlongProcName.c_str(); appSpawnContent->content.longProcNameLen = longProcNameLen; appSpawnContent->timer = NULL; appSpawnContent->content.runAppSpawn = NULL; -- Gitee From c14af23fd1cfe9991edce76a04891e174a2545ca Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 23 May 2022 19:58:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- .../app_spawn_standard_test/app_spawn_standard_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp index 8482a04c..24cef5f8 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp @@ -86,7 +86,7 @@ HWTEST(AppSpawnStandardTest, App_Spawn_Standard_002, TestSize.Level0) AppSpawnContentExt* appSpawnContent = (AppSpawnContentExt*)malloc(sizeof(AppSpawnContentExt)); EXPECT_TRUE(appSpawnContent); - appSpawnContent->content.longProcName = reinterpret_castlongProcName.c_str(); + appSpawnContent->content.longProcName = reinterpret_cast(longProcName.c_str()); appSpawnContent->content.longProcNameLen = longProcNameLen; appSpawnContent->timer = NULL; appSpawnContent->content.runAppSpawn = NULL; -- Gitee