commit 5c201e210de3638bb10111073d45a402b2e7941b
author Brian Silverman <brians> Thu Jun 12 22:40:28 2014 -0700
committer Brian Silverman <brians> Thu Jun 12 22:40:28 2014 -0700
tree aa92ef717cc4ec173c32a1061c5593176c6b3e36
parent 53414af106e93830e655af6e9b420753cc13505f

fix broken tests

aos/common/logging/logging_impl.cc

diff --git a/aos/common/logging/logging_impl.cc b/aos/common/logging/logging_impl.cc
index 43a20e0..724d4b8 100644
--- a/aos/common/logging/logging_impl.cc
+++ b/aos/common/logging/logging_impl.cc
@@ -44,6 +44,11 @@
 RootLogImplementation *root_implementation = nullptr;
 
 void SetGlobalImplementation(LogImplementation *implementation) {
+  if (root_implementation == nullptr) {
+    fputs("Somebody didn't call logging::Init()!\n", stderr);
+    abort();
+  }
+
   Context *context = Context::Get();
 
   context->implementation = implementation;

aos/common/mutex_test.cc

diff --git a/aos/common/mutex_test.cc b/aos/common/mutex_test.cc
index f55d15d..6ec62d8 100644
--- a/aos/common/mutex_test.cc
+++ b/aos/common/mutex_test.cc
@@ -46,6 +46,7 @@
 
 // Sees what happens with multiple unlocks.
 TEST_F(MutexDeathTest, RepeatUnlock) {
+  logging::Init();
   test_mutex.Lock();
   test_mutex.Unlock();
   EXPECT_DEATH(
@@ -58,6 +59,7 @@
 
 // Sees what happens if you unlock without ever locking (or unlocking) it.
 TEST_F(MutexDeathTest, NeverLock) {
+  logging::Init();
   EXPECT_DEATH(
       {
         logging::AddImplementation(new util::DeathTestLogImplementation());

aos/common/time_test.cc

diff --git a/aos/common/time_test.cc b/aos/common/time_test.cc
index cc19965..c6ddd0c 100644
--- a/aos/common/time_test.cc
+++ b/aos/common/time_test.cc
@@ -30,6 +30,7 @@
 }
 
 TEST(TimeDeathTest, ConstructorChecking) {
+  logging::Init();
   EXPECT_DEATH(
       {
         logging::AddImplementation(new util::DeathTestLogImplementation());