ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logcat: apct test failures" am: 90c2e75

Browse source 
am: ab2075a

* commit 'ab2075a9d3717c60df63aed00d1b605aad884a64':
  logcat: apct test failures

Change-Id: I3caf1cd746ec7a43918a7028d836ba05ec7275ee
This commit is contained in:
Treehugger Robot 2016-04-12 23:22:10 +00:00 • committed by android-build-merger
commit ac8bcae4f7
1 changed files with 48 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
logcat/tests/logcat_test.cpp
View file

@ -155,23 +155,29 @@ TEST(logcat, tz) {
return; return;
} }
FILE *fp; int tries = 3; // in case run too soon after system start or buffer clear
int count;
ASSERT_TRUE(NULL != (fp = popen( do {
"logcat -v long -v America/Los_Angeles -b all -t 3 2>/dev/null", FILE *fp;
"r")));
char buffer[5120]; ASSERT_TRUE(NULL != (fp = popen(
"logcat -v long -v America/Los_Angeles -b all -t 3 2>/dev/null",
"r")));
int count = 0; char buffer[5120];
while (fgetLongTime(buffer, sizeof(buffer), fp)) { count = 0;
if (strstr(buffer, " -0700") || strstr(buffer, " -0800")) {
++count; while (fgetLongTime(buffer, sizeof(buffer), fp)) {
if (strstr(buffer, " -0700") || strstr(buffer, " -0800")) {
++count;
}
} }
}
pclose(fp); pclose(fp);
} while ((count < 3) && --tries && (sleep(1), true));
ASSERT_EQ(3, count); ASSERT_EQ(3, count);
} }
@ -198,84 +204,47 @@ TEST(logcat, ntz) {
ASSERT_EQ(0, count); ASSERT_EQ(0, count);
} }
void do_tail(int num) {
int tries = 3; // in case run too soon after system start or buffer clear
int count;
do {
char buffer[5120];
snprintf(buffer, sizeof(buffer),
"logcat -v long -b radio -b events -b system -b main -t %d 2>/dev/null",
num);
FILE *fp;
ASSERT_TRUE(NULL != (fp = popen(buffer, "r")));
count = 0;
while (fgetLongTime(buffer, sizeof(buffer), fp)) {
++count;
}
pclose(fp);
} while ((count < num) && --tries && (sleep(1), true));
ASSERT_EQ(num, count);
}
TEST(logcat, tail_3) { TEST(logcat, tail_3) {
FILE *fp; do_tail(3);
ASSERT_TRUE(NULL != (fp = popen(
"logcat -v long -b radio -b events -b system -b main -t 3 2>/dev/null",
"r")));
char buffer[5120];
int count = 0;
while (fgetLongTime(buffer, sizeof(buffer), fp)) {
++count;
}
pclose(fp);
ASSERT_EQ(3, count);
} }
TEST(logcat, tail_10) { TEST(logcat, tail_10) {
FILE *fp; do_tail(10);
ASSERT_TRUE(NULL != (fp = popen(
"logcat -v long -b radio -b events -b system -b main -t 10 2>/dev/null",
"r")));
char buffer[5120];
int count = 0;
while (fgetLongTime(buffer, sizeof(buffer), fp)) {
++count;
}
pclose(fp);
ASSERT_EQ(10, count);
} }
TEST(logcat, tail_100) { TEST(logcat, tail_100) {
FILE *fp; do_tail(100);
ASSERT_TRUE(NULL != (fp = popen(
"logcat -v long -b radio -b events -b system -b main -t 100 2>/dev/null",
"r")));
char buffer[5120];
int count = 0;
while (fgetLongTime(buffer, sizeof(buffer), fp)) {
++count;
}
pclose(fp);
ASSERT_EQ(100, count);
} }
TEST(logcat, tail_1000) { TEST(logcat, tail_1000) {
FILE *fp; do_tail(1000);
ASSERT_TRUE(NULL != (fp = popen(
"logcat -v long -b radio -b events -b system -b main -t 1000 2>/dev/null",
"r")));
char buffer[5120];
int count = 0;
while (fgetLongTime(buffer, sizeof(buffer), fp)) {
++count;
}
pclose(fp);
ASSERT_EQ(1000, count);
} }
TEST(logcat, tail_time) { TEST(logcat, tail_time) {