From e01048e685462b5f6a1c4261bab37dab23dc9299 Mon Sep 17 00:00:00 2001 From: mucor Date: Fri, 16 Apr 2021 18:29:06 +0800 Subject: [PATCH] fix dac testcase Change-Id: Ic0dec79b7d7ec9ad53679c048b9d20722feefa0a --- .../capability/src/ActsCapabilityTest.cpp | 1 + .../permission_posix/dac/src/ActsSystemDevDacTest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp b/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp index c87ba98f4..e631d0ec1 100755 --- a/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp +++ b/security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp @@ -44,6 +44,7 @@ static int TestDacOverrideSuccess() LOG("ErrInfo: Failed to chdir 'TOP_DIR/CAPDIR0/CAPDIR0_CAPDIR1' with CAP_DAC_OVERRIDE"); return FALSE; } + chdir(TOP_DIR "/" CAPDIR0); // Delete the directory 'mkdir' in the directory 'TOP_DIR/CAPDIR0' ret = rmdir(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPDIR1); if (ret != 0) { diff --git a/security_lite/permission_posix/dac/src/ActsSystemDevDacTest.cpp b/security_lite/permission_posix/dac/src/ActsSystemDevDacTest.cpp index 12c4d0fbe..1d652be08 100755 --- a/security_lite/permission_posix/dac/src/ActsSystemDevDacTest.cpp +++ b/security_lite/permission_posix/dac/src/ActsSystemDevDacTest.cpp @@ -25,7 +25,7 @@ using namespace std; using namespace testing::ext; -#if defined(LITE_FS_JFFS2) || defined(LITE_FS_VFAT) +#if defined(LITE_FS_JFFS2) static void CreateDevDir() { int ret; @@ -616,7 +616,7 @@ HWTEST_F(DacTestSuite, DACTest0420, Function | MediumTest | Level2) SetUidGid(UID0, GID555); // Step 3: Invoke the interface to operate the file system ret = chdir("/storage/" DACDIR0 "/" DACDIR0_DACDIR0); - if (ret != FALSE) { + if (ret != 0) { LOG("ErrInfo: VFS error with DAC or Capability"); exitCode = 1; } @@ -1381,7 +1381,7 @@ HWTEST_F(DacTestSuite, DACTest0600, Function | MediumTest | Level2) SetUidGid(UID555, GID555); // Step 3: Invoke the interface to operate the file system ret = mkdir("/storage/" DACDIR0 "/" DACDIR0_DACDIR0 "/" DACDIR0_DACDIR0_DACDIR0, NORWX); - if (ret != FALSE) { + if (ret != 0) { LOG("ErrInfo: VFS error with DAC or Capability"); exitCode = 1; } @@ -2051,4 +2051,4 @@ HWTEST_F(DacTestSuite, DACTest0750, Function | MediumTest | Level2) EXPECT_EQ(WEXITSTATUS(status), 0) << "ErrInfo: The exitCode is wrong, please query logs, child_pid = " << pid; } } -#endif \ No newline at end of file +#endif -- GitLab