提交 77ecf1e0 编写于 作者: J jiyong

security_lite and appexefwk_lite modify

上级 a891275f
...@@ -281,7 +281,7 @@ HWTEST_F(AbilityMgrTest2, testWantToUri, Function | MediumTest | Level0) ...@@ -281,7 +281,7 @@ HWTEST_F(AbilityMgrTest2, testWantToUri, Function | MediumTest | Level0)
ElementName element = { nullptr }; ElementName element = { nullptr };
SetElementDeviceID(&element, "0001000"); SetElementDeviceID(&element, "0001000");
SetElementBundleName(&element, "com.huawei.testnative"); SetElementBundleName(&element, "com.huawei.testnative");
SetElementAbilityName(&element, "ServiceAbility"); SetElementAbilityName(&element, "SecondAbility");
if (element.abilityName !=nullptr) { if (element.abilityName !=nullptr) {
bool setResult = SetWantElement(&want, element); bool setResult = SetWantElement(&want, element);
if (setResult) { if (setResult) {
......
...@@ -1526,9 +1526,6 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2200, Security | MediumTest | Level1 ...@@ -1526,9 +1526,6 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2200, Security | MediumTest | Level1
// Step 9: Check the capability of process 'wms_server' or 'ai_server', pid = 9 // Step 9: Check the capability of process 'wms_server' or 'ai_server', pid = 9
ret = CapgetWithCaps(WMS_SERVER_OR_AI_SERVER_PID, WMS_SERVER_OR_AI_SERVER_CAP); ret = CapgetWithCaps(WMS_SERVER_OR_AI_SERVER_PID, WMS_SERVER_OR_AI_SERVER_CAP);
EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 9, process wms_server or ai_server has wrong capability"; EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 9, process wms_server or ai_server has wrong capability";
// Step 10: Check the capability of process 'hiview', pid = 10
ret = CapgetWithCaps(HIVIEW_PID, HIVIEW_CAP);
EXPECT_EQ(ret, 0) << "ErrInfo: Pid = 10, process hiview has wrong capability";
} }
#endif #endif
...@@ -1705,14 +1702,14 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2600, Performance | MediumTest | Lev ...@@ -1705,14 +1702,14 @@ HWTEST_F(CapabilityTestSuite, CapabilityTest2600, Performance | MediumTest | Lev
// Preset action: Obtains the system time -> starttime // Preset action: Obtains the system time -> starttime
clock_gettime(CLOCK_REALTIME, &starttime); clock_gettime(CLOCK_REALTIME, &starttime);
// Step 1: Chown for 10000 times // Step 1: Chown for 10000 times
for (int number = 0; number < NUM10000; number++) { for (int number = 0; number < NUM1000; number++) {
chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, number, number); chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, number, number);
} }
// Step 2: Obtains the system time again -> endtime // Step 2: Obtains the system time again -> endtime
clock_gettime(CLOCK_REALTIME, &endtime); clock_gettime(CLOCK_REALTIME, &endtime);
// Step 3: Compare the starttime and the endtime -> tp // Step 3: Compare the starttime and the endtime -> tp
tp = CompareTime(starttime, endtime); tp = CompareTime(starttime, endtime);
EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 10000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s"; EXPECT_LE(tp.tv_sec, NUM80) << "ErrInfo: Chown for 1000 times used " << tp.tv_sec << "." << tp.tv_nsec << "s";
// Cleanup action: Restore the initial status of the file // Cleanup action: Restore the initial status of the file
chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, UID0, GID0); chown(TOP_DIR "/" CAPDIR0 "/" CAPDIR0_CAPFILE0, UID0, GID0);
} }
......
...@@ -41,7 +41,7 @@ hcpptest_suite("ActsVFATCapabilityTest") { ...@@ -41,7 +41,7 @@ hcpptest_suite("ActsVFATCapabilityTest") {
defines = [ defines = [
"LITE_FS_VFAT", "LITE_FS_VFAT",
"TOP_DIR=\"/userdata\"", "TOP_DIR=\"/sdcard\"",
"TOP_DIR_MOUNT_INFO=\"/userdata vfat\"", "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"",
] ]
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册