am ca3292bf: am bd0962c2: Merge "logcat: timed tests fail under load"

* commit 'ca3292bf71240c61b87b5077f55ad6a178e99ddc':
  logcat: timed tests fail under load
This commit is contained in:
Mark Salyzyn 2014-03-24 20:34:16 +00:00 committed by Android Git Automerger
commit 433aabc707

View file

@ -343,7 +343,6 @@ TEST(logcat, blocking) {
signal(SIGALRM, caught_blocking);
alarm(2);
while (fgets(buffer, sizeof(buffer), fp)) {
alarm(2);
if (!strncmp(buffer, "DONE", 4)) {
break;
@ -413,7 +412,6 @@ TEST(logcat, blocking_tail) {
signal(SIGALRM, caught_blocking_tail);
alarm(2);
while (fgets(buffer, sizeof(buffer), fp)) {
alarm(2);
if (!strncmp(buffer, "DONE", 4)) {
break;
@ -484,7 +482,6 @@ TEST(logcat, blocking_clear) {
signal(SIGALRM, caught_blocking_clear);
alarm(2);
while (fgets(buffer, sizeof(buffer), fp)) {
alarm(2);
if (!strncmp(buffer, "clearLog: ", 10)) {
fprintf(stderr, "WARNING: Test lacks permission to run :-(\n");