fixed various workarounds for build(ish) issues better
diff --git a/aos/common/queue_testutils.cc b/aos/common/queue_testutils.cc
index 4e62dcd..1b9b731 100644
--- a/aos/common/queue_testutils.cc
+++ b/aos/common/queue_testutils.cc
@@ -50,7 +50,7 @@
}
virtual void HandleMessage(const LogMessage &message) override {
- if (!logging::log_gt_important(WARNING, message.level)) {
+ if (message.level == FATAL) {
logging::internal::PrintMessage(stdout, message);
}
diff --git a/aos/linux_code/ipc_lib/queue.cc b/aos/linux_code/ipc_lib/queue.cc
index 4025554..7c19b30 100644
--- a/aos/linux_code/ipc_lib/queue.cc
+++ b/aos/linux_code/ipc_lib/queue.cc
@@ -563,12 +563,4 @@
return r;
}
-bool RawQueue::IsDebug() {
-#if AOS_DEBUG
- return true;
-#else
- return false;
-#endif
-}
-
} // namespace aos
diff --git a/aos/linux_code/ipc_lib/queue.h b/aos/linux_code/ipc_lib/queue.h
index 52d610e..5edce62 100644
--- a/aos/linux_code/ipc_lib/queue.h
+++ b/aos/linux_code/ipc_lib/queue.h
@@ -122,11 +122,6 @@
// only 1 task is using this object (ie in tests).
int FreeMessages() const;
- // Returns whether this is using the queue code compiled for debugging (used
- // by the tests etc) or not (used by everything else because it uses
- // noticeably less CPU).
- static bool IsDebug();
-
private:
struct MessageHeader;
diff --git a/aos/linux_code/ipc_lib/raw_queue_test.cc b/aos/linux_code/ipc_lib/raw_queue_test.cc
index fecf488..67b687a 100644
--- a/aos/linux_code/ipc_lib/raw_queue_test.cc
+++ b/aos/linux_code/ipc_lib/raw_queue_test.cc
@@ -316,10 +316,6 @@
constexpr time::Time RawQueueTest::kHangTime;
constexpr time::Time RawQueueTest::kForkSleep;
-TEST_F(RawQueueTest, Basic) {
- EXPECT_TRUE(RawQueue::IsDebug());
-}
-
TEST_F(RawQueueTest, Reading) {
RawQueue *const queue = RawQueue::Fetch("Queue", sizeof(TestMessage), 1, 1);
MessageArgs args{queue, 0, -1};