diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-04-19 07:21:07 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-04-20 08:24:38 -0700 |
| commit | 0a1424e1964ef6152c49f903e022a66fa2de64f5 (patch) | |
| tree | af9a21e071a64e518ed05e8b9fb60b002e2e1fc8 /logcat | |
| parent | 3c501b50b41086cde59a6811f4aa5cd3e736f5f2 (diff) | |
| download | system_core-0a1424e1964ef6152c49f903e022a66fa2de64f5.tar.gz system_core-0a1424e1964ef6152c49f903e022a66fa2de64f5.tar.bz2 system_core-0a1424e1964ef6152c49f903e022a66fa2de64f5.zip | |
logcat: test: also check "failed to clear" in blocking_clear
Add more detail about logcat.blocking_clear test failure
Test: gTest logcat-unit-test --gtest_filter=logcat.blocking_clear
Bug: 37483775
Change-Id: I6555c13593781a1278d9106e66c2dec6009a2215
Diffstat (limited to 'logcat')
| -rw-r--r-- | logcat/tests/logcat_test.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp index e487a9720..9c0747211 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp @@ -1216,7 +1216,12 @@ TEST(logcat, blocking_clear) { signal(SIGALRM, caught_blocking_clear); alarm(2); while (fgets(buffer, sizeof(buffer), fp)) { - if (!strncmp(buffer, "clearLog: ", 10)) { + if (!strncmp(buffer, "clearLog: ", strlen("clearLog: "))) { + fprintf(stderr, "WARNING: Test lacks permission to run :-(\n"); + count = signals = 1; + break; + } + if (!strncmp(buffer, "failed to clear", strlen("failed to clear"))) { fprintf(stderr, "WARNING: Test lacks permission to run :-(\n"); count = signals = 1; break; |