commit 2c930108d9041f997f7615ebeb9375d7e7b06cb7
author Sen Jiang <senj@google.com> Sat Mar 03 05:16:43 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 03 05:16:43 2018 +0000
tree 1da1638e57584a425990a113b2cdbe88c727d732
parent 0d300ea3b3e4f073d285eeb5c6991d651e436422
parent 2ca39d03a91d468cf700a7774a3d500025a7aaa3

Disable logging to string in unittest. am: 26d8977280
am: 2ca39d03a9

Change-Id: Iea4f6488835ce9ad0d639c1ed587b336761cbf38

testrunner.cc

diff --git a/testrunner.cc b/testrunner.cc
index 635e120..81d4548 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -44,6 +44,8 @@
   base::CommandLine::Init(argc, argv);
   LOG(INFO) << "initializing gtest";
   SetUpTests(&argc, argv, true);
+  // Logging to string is not thread safe.
+  brillo::LogToString(false);
   LOG(INFO) << "running unit tests";
   int test_result = RUN_ALL_TESTS();
   LOG(INFO) << "unittest return value: " << test_result;