From 02586301b8f905704c6a81c08ac40a2a2f196681 Mon Sep 17 00:00:00 2001
From: yang1946 <yuzhaoyang1@huawei.com>
Date: Fri, 8 Dec 2023 15:41:36 +0800
Subject: [PATCH] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9xpm?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yang1946 <yuzhaoyang1@huawei.com>
---
 interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp | 2 +-
 interfaces/innerkits/common/include/errcode.h                | 1 -
 test/unittest/code_sign_utils_test.cpp                       | 2 +-
 test/unittest/enable_verity_test.cpp                         | 4 ++++
 test/unittest/utils/include/xpm_common.h                     | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp b/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp
index edec29f..7625264 100644
--- a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp
+++ b/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp
@@ -267,7 +267,7 @@ int32_t CodeSignUtils::EnforceCodeSignForAppWithOwnerId(const std::string &owner
 
         ShowCodeSignInfo(targetFile, arg);
         if (!CheckFilePathValid(targetFile, Constants::ENABLE_APP_BASE_PATH)) {
-            return CS_ERR_TARGET_FILE_PATH;
+            return CS_ERR_FILE_PATH;
         }
         multiTask.AddTaskData(targetFile, arg);
     } while (ret == CS_SUCCESS);
diff --git a/interfaces/innerkits/common/include/errcode.h b/interfaces/innerkits/common/include/errcode.h
index 4dab364..848e7e2 100644
--- a/interfaces/innerkits/common/include/errcode.h
+++ b/interfaces/innerkits/common/include/errcode.h
@@ -95,6 +95,5 @@ enum SignBlockErrCode {
     CS_ERR_SO_SIGN_SIZE = -0x620,
     CS_ERR_SIGN_ADDR_ALIGN = -0x621,
     CS_ERR_SIGN_EXTENSION_OFFSET_ALIGN = -0x622,
-    CS_ERR_TARGET_FILE_PATH = -0x623,
 };
 #endif
diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp
index a6a8c17..be9b131 100644
--- a/test/unittest/code_sign_utils_test.cpp
+++ b/test/unittest/code_sign_utils_test.cpp
@@ -469,7 +469,7 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0016, TestSize.Level0)
     EXPECT_EQ(ret, CS_SUCCESS);
 
     ret = utils.EnforceCodeSignForApp(hapRealPath, entryMap, FILE_ALL);
-    EXPECT_EQ(ret, CS_ERR_TARGET_FILE_PATH);
+    EXPECT_EQ(ret, CS_ERR_FILE_PATH);
 }
 
 /**
diff --git a/test/unittest/enable_verity_test.cpp b/test/unittest/enable_verity_test.cpp
index be5c850..acf1aef 100644
--- a/test/unittest/enable_verity_test.cpp
+++ b/test/unittest/enable_verity_test.cpp
@@ -78,6 +78,10 @@ public:
         g_isXpmOn = AllocXpmRegion();
         SaveStringToFile(SELINUX_MODE_PATH, PERMISSIVE_MODE);
         SaveStringToFile(XPM_DEBUG_FS_MODE_PATH, ENFORCE_MODE);
+        if (g_isXpmOn) {
+            std::string realPath;
+            g_isXpmOn = OHOS::PathToRealPath(XPM_DEBUG_FS_MODE_PATH, realPath);
+        }
     };
     static void TearDownTestCase()
     {
diff --git a/test/unittest/utils/include/xpm_common.h b/test/unittest/utils/include/xpm_common.h
index 23be215..067fcbf 100644
--- a/test/unittest/utils/include/xpm_common.h
+++ b/test/unittest/utils/include/xpm_common.h
@@ -29,7 +29,7 @@ constexpr unsigned long MAP_XPM = 0x40;
 const unsigned long PAGE_SIZE = (sysconf(_SC_PAGESIZE));
 const unsigned long PAGE_MASK = ~(PAGE_SIZE - 1);
 
-const std::string XPM_DEBUG_FS_MODE_PATH = "/sys/kernel/debug/xpm/xpm_mode";
+const std::string XPM_DEBUG_FS_MODE_PATH = "/proc/sys/kernel/xpm/xpm_mode";
 const std::string SELINUX_MODE_PATH = "/sys/fs/selinux/enforce";
 const std::string PERMISSIVE_MODE = "0";
 const std::string ENFORCE_MODE = "1";
-- 
Gitee