Remove usage of CHECK_NOTNULL
We want to switch to absl logging instead of glog. gtest and ceres are
going there, and we already have absl as a dependency. ABSL doesn't
have CHECK_NOTNULL, and we can move things over in an easier to review
fashion.
Change-Id: Ifd9a11ec34a2357cec43f88dba015db9c28ed2cf
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/aos/events/shm_event_loop_test.cc b/aos/events/shm_event_loop_test.cc
index 2fbe735..aae8f15 100644
--- a/aos/events/shm_event_loop_test.cc
+++ b/aos/events/shm_event_loop_test.cc
@@ -17,13 +17,6 @@
class ShmEventLoopTestFactory : public EventLoopTestFactory {
public:
ShmEventLoopTestFactory() {
- // Put all the queue files in ${TEST_TMPDIR} if it is set, otherwise
- // everything will be reusing /dev/shm when sharded.
- char *test_tmpdir = getenv("TEST_TMPDIR");
- if (test_tmpdir != nullptr) {
- FLAGS_shm_base = std::string(test_tmpdir) + "/aos";
- }
-
// Clean up anything left there before.
unlink((FLAGS_shm_base + "/test/aos.TestMessage.v7").c_str());
unlink((FLAGS_shm_base + "/test1/aos.TestMessage.v7").c_str());
@@ -58,14 +51,19 @@
}
Result<void> Run() override {
- return CHECK_NOTNULL(primary_event_loop_)->Run();
+ CHECK(primary_event_loop_ != nullptr);
+ return primary_event_loop_->Run();
}
std::unique_ptr<ExitHandle> MakeExitHandle() override {
- return CHECK_NOTNULL(primary_event_loop_)->MakeExitHandle();
+ CHECK(primary_event_loop_ != nullptr);
+ return primary_event_loop_->MakeExitHandle();
}
- void Exit() override { CHECK_NOTNULL(primary_event_loop_)->Exit(); }
+ void Exit() override {
+ CHECK(primary_event_loop_ != nullptr);
+ primary_event_loop_->Exit();
+ }
void SleepFor(::std::chrono::nanoseconds duration) override {
::std::this_thread::sleep_for(duration);