commit f5f8d8eac63ac6423453461a6b211dff4add67dd
author Brian Silverman <brian@peloton-tech.com> Sun Dec 06 18:39:12 2015 -0500
committer Brian Silverman <brian@peloton-tech.com> Thu Dec 24 14:33:43 2015 -0800
tree d786a7ca09cb102c86f0009262e0ee502356db6c
parent 279e2e331f31fc9f39e89a1a0a89e7ac69e95acc

Split out //aos/common:queue_testutils and rename stuff

It had three independent pieces of functionality, one of which had a
pretty bad name.

Change-Id: I4a6937692fa36e74f814b3be4d4c5bc751947088

aos/common/condition_test.cc

diff --git a/aos/common/condition_test.cc b/aos/common/condition_test.cc
index 2310273..dbaa546 100644
--- a/aos/common/condition_test.cc
+++ b/aos/common/condition_test.cc
@@ -10,7 +10,7 @@
 
 #include "aos/common/time.h"
 #include "aos/common/mutex.h"
-#include "aos/common/queue_testutils.h"
+#include "aos/testing/test_shm.h"
 #include "aos/common/type_traits.h"
 #include "aos/linux_code/ipc_lib/core_lib.h"
 #include "aos/common/logging/logging.h"
@@ -18,9 +18,9 @@
 #include "aos/linux_code/ipc_lib/aos_sync.h"
 #include "aos/common/die.h"
 #include "aos/common/util/thread.h"
+#include "aos/testing/prevent_exit.h"
 
 using ::aos::time::Time;
-using ::aos::common::testing::GlobalCoreInstance;
 
 namespace aos {
 namespace testing {
@@ -37,7 +37,7 @@
   DISALLOW_COPY_AND_ASSIGN(ConditionTestCommon);
 };
 
-// Some simple tests that don't rely on a GlobalCoreInstance to help with
+// Some simple tests that don't rely on a TestSharedMemory to help with
 // debugging problems that cause tests using that to just completely lock up.
 class SimpleConditionTest : public ConditionTestCommon {
  public:
@@ -93,7 +93,7 @@
     shared_->~Shared();
   }
 
-  GlobalCoreInstance my_core;
+  ::aos::testing::TestSharedMemory my_shm_;
 
   Shared *const shared_;
 
@@ -136,7 +136,7 @@
 
     child_ = fork();
     if (child_ == 0) {  // in child
-      ::aos::common::testing::PreventExit();
+      ::aos::testing::PreventExit();
       Run();
       exit(EXIT_SUCCESS);
     } else {  // in parent