tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Iaddc4e1b,I57d84af2

Browse source 
* changes:
  liblog: test: __android_log_btwrite__android_log_close precharge
  logcat: test -v epoch tail time
This commit is contained in:
Treehugger Robot 2017-03-14 14:43:52 +00:00 committed by Gerrit Code Review
commit fa05eaa968
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
liblog/tests/liblog_test.cpp
View file

@ -169,6 +169,9 @@ static bool tested__android_log_close;
TEST(liblog, __android_log_btwrite__android_logger_list_read) {
#if (defined(__ANDROID__) || defined(USING_LOGGER_LOCAL))
#ifdef TEST_PREFIX
TEST_PREFIX
#endif
struct logger_list* logger_list;
pid_t pid = getpid();

28
logcat/tests/logcat_test.cpp
View file

@ -329,7 +329,7 @@ TEST(logcat, tail_1000) {
do_tail(1000);
}
TEST(logcat, tail_time) {
static void do_tail_time(const char* cmd) {
FILE* fp;
int count;
char buffer[BIG_BUFFER];
@ -343,14 +343,9 @@ TEST(logcat, tail_time) {
int tries = 4; // in case run too soon after system start or buffer clear
do {
snprintf(buffer, sizeof(buffer), "%s -t 10 2>&1", cmd);
logcat_define(ctx);
ASSERT_TRUE(NULL != (fp = logcat_popen(ctx,
"logcat"
" -v long"
" -v nsec"
" -b all"
" -t 10"
" 2>&1")));
ASSERT_TRUE(NULL != (fp = logcat_popen(ctx, buffer)));
count = 0;
while ((input = fgetLongTime(buffer, sizeof(buffer), fp))) {
@ -372,14 +367,7 @@ TEST(logcat, tail_time) {
EXPECT_TRUE(first_timestamp != NULL);
EXPECT_TRUE(second_timestamp != NULL);
snprintf(buffer, sizeof(buffer),
"logcat"
" -v long"
" -v nsec"
" -b all"
" -t '%s'"
" 2>&1",
first_timestamp);
snprintf(buffer, sizeof(buffer), "%s -t '%s' 2>&1", cmd, first_timestamp);
logcat_define(ctx);
ASSERT_TRUE(NULL != (fp = logcat_popen(ctx, buffer)));
@ -446,6 +434,14 @@ TEST(logcat, tail_time) {
EXPECT_LE(count, last_timestamp_count);
}
TEST(logcat, tail_time) {
do_tail_time("logcat -v long -v nsec -b all");
}
TEST(logcat, tail_time_epoch) {
do_tail_time("logcat -v long -v nsec -v epoch -b all");
}
TEST(logcat, End_to_End) {
pid_t pid = getpid();