Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb231453 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

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

* commit '433aabc7':
  logcat: timed tests fail under load
parents 4ab9c1ae 433aabc7

logcat/tests/logcat_test.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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");