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

Commit a033693a authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "liblog: enable tests accidentally disabled"

parents eb940262 1bc13018
Loading
Loading
Loading
Loading
+0 −15
Original line number Original line Diff line number Diff line
@@ -3004,21 +3004,6 @@ TEST(liblog, create_android_logger_overflow) {
  EXPECT_LE(0, android_log_destroy(&ctx));
  EXPECT_LE(0, android_log_destroy(&ctx));
  ASSERT_TRUE(NULL == ctx);
  ASSERT_TRUE(NULL == ctx);
}
}

TEST(liblog, android_log_write_list_buffer) {
  __android_log_event_list ctx(1005);
  ctx << 1005 << "tag_def"
      << "(tag|1),(name|3),(format|3)";
  std::string buffer(ctx);
  ctx.close();

  char msgBuf[1024];
  memset(msgBuf, 0, sizeof(msgBuf));
  EXPECT_EQ(android_log_buffer_to_string(buffer.data(), buffer.length(), msgBuf,
                                         sizeof(msgBuf)),
            0);
  EXPECT_STREQ(msgBuf, "[1005,tag_def,(tag|1),(name|3),(format|3)]");
}
#endif  // USING_LOGGER_DEFAULT
#endif  // USING_LOGGER_DEFAULT


#ifdef USING_LOGGER_DEFAULT  // Do not retest pmsg functionality
#ifdef USING_LOGGER_DEFAULT  // Do not retest pmsg functionality
+1 −0
Original line number Original line Diff line number Diff line
@@ -2,4 +2,5 @@
#include <log/log_transport.h>
#include <log/log_transport.h>
#define TEST_LOGGER LOGGER_DEFAULT
#define TEST_LOGGER LOGGER_DEFAULT
#endif
#endif
#define USING_LOGGER_DEFAULT
#include "liblog_test.cpp"
#include "liblog_test.cpp"