openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "liblog: tests: liblog.__security property failure" am: 2a54ae97eb am: 1bc4b39bef 

am: 82bfcca2ae

Change-Id: I4a66d2bc35a0d4d47b0ffe838db2dcbada632dd1
This commit is contained in:
Mark Salyzyn 2017-03-22 00:40:39 +00:00 committed by android-build-merger
parent 213222fbb4 82bfcca2ae
commit 17e220f6e1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
liblog/tests/liblog_test.cpp
View File

@ -1854,8 +1854,22 @@ TEST(liblog, __security) {
fprintf(stderr, "WARNING: setting ro.device_owner to a domain\n");
static const char domain[] = "com.google.android.SecOps.DeviceOwner";
property_set(readonly_key, domain);
usleep(20000); // property system does not guarantee performance, rest ...
property_get(readonly_key, readonly, nothing_val);
useconds_t total_time = 0;
static const useconds_t seconds = 1000000;
static const useconds_t max_time = 5 * seconds; // not going to happen
static const useconds_t rest = 20 * 1000;
for (; total_time < max_time; total_time += rest) {
usleep(rest); // property system does not guarantee performance.
property_get(readonly_key, readonly, nothing_val);
if (!strcmp(readonly, domain)) {
if (total_time > rest) {
fprintf(stderr, "INFO: took %u.%06u seconds to set property\n",
(unsigned)(total_time / seconds),
(unsigned)(total_time % seconds));
}
break;
}
}
EXPECT_STREQ(readonly, domain);
} else if (!strcasecmp(readonly, "false") || !readonly[0]) {
// not enough permissions to run