commit b972a83f9a9c8be65295c6e0e1ed82b58faeb5c7
author Stephan Pleines <pleines.stephan@gmail.com> Sun Jun 02 21:04:33 2024 -0700
committer Gerrit Code Review <gerrit@software.frc971.org> Sun Jun 02 21:04:33 2024 -0700
tree 517c55647b827136caf55e0d2d93b289cba359a4
parent d98155ac7aec5cfe131273672fbd898c0f532f28
parent ad3085f338dbe1f363777de1f3054936d13d9deb

Merge "iwyu: //aos/testing/..."

aos/testing/gtest_main.cc

diff --git a/aos/testing/gtest_main.cc b/aos/testing/gtest_main.cc
index 6071bde..1940988 100644
--- a/aos/testing/gtest_main.cc
+++ b/aos/testing/gtest_main.cc
@@ -1,7 +1,3 @@
-#include <getopt.h>
-
-#include <iostream>
-
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"

aos/testing/test_logging.cc

diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index 56875bb..15cb64b 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -1,6 +1,12 @@
 #include "aos/testing/test_logging.h"
 
+#include <string.h>
+
+#include <algorithm>
 #include <cstdio>
+#include <memory>
+#include <mutex>
+#include <string_view>
 #include <vector>
 
 #include "absl/base/call_once.h"
@@ -8,6 +14,7 @@
 
 #include "aos/logging/implementations.h"
 #include "aos/stl_mutex/stl_mutex.h"
+#include "aos/time/time.h"
 
 using ::aos::logging::LogMessage;
 

aos/testing/test_logging.h

diff --git a/aos/testing/test_logging.h b/aos/testing/test_logging.h
index 3671aa1..b7e8977 100644
--- a/aos/testing/test_logging.h
+++ b/aos/testing/test_logging.h
@@ -1,8 +1,6 @@
 #ifndef AOS_TESTING_TEST_LOGGING_H_
 #define AOS_TESTING_TEST_LOGGING_H_
 
-#include "aos/time/time.h"
-
 namespace aos::testing {
 
 // Enables the logging framework for use during a gtest test.

aos/testing/test_logging_test.cc

diff --git a/aos/testing/test_logging_test.cc b/aos/testing/test_logging_test.cc
index 5731545..b37bec4 100644
--- a/aos/testing/test_logging_test.cc
+++ b/aos/testing/test_logging_test.cc
@@ -1,5 +1,6 @@
 #include "aos/testing/test_logging.h"
 
+#include <memory>
 #include <thread>
 
 #include "gtest/gtest.h"

aos/testing/test_shm.cc

diff --git a/aos/testing/test_shm.cc b/aos/testing/test_shm.cc
index 1b168ea..4922b63 100644
--- a/aos/testing/test_shm.cc
+++ b/aos/testing/test_shm.cc
@@ -1,9 +1,9 @@
 #include "aos/testing/test_shm.h"
 
+#include <stddef.h>
 #include <sys/mman.h>
 
-#include "gflags/gflags.h"
-
+#include "aos/ipc_lib/shared_mem.h"
 #include "aos/logging/logging.h"
 #include "aos/testing/test_logging.h"
 

aos/testing/test_shm.h

diff --git a/aos/testing/test_shm.h b/aos/testing/test_shm.h
index 658a72d..24c87ce 100644
--- a/aos/testing/test_shm.h
+++ b/aos/testing/test_shm.h
@@ -1,7 +1,7 @@
 #ifndef AOS_TESTING_TEST_SHM_H_
 #define AOS_TESTING_TEST_SHM_H_
 
-#include "aos/ipc_lib/shared_mem.h"
+#include "aos/ipc_lib/shared_mem_types.h"
 
 namespace aos::testing {