Remove use of -isystem for googletest
Use standard include_dirs and a proxy header to manually suppress
warning. This solves the problem of sign conversion warning that
fire only when rolling into chrome.
Follow-up CLs will try to remove -isystem also to other
buildtools. Limiting the scope of this for now.
Change-Id: I8bc7924a95c7dd73cad54f447c122bd339e4e2a4
Bug: 129130827
diff --git a/src/base/circular_queue_unittest.cc b/src/base/circular_queue_unittest.cc
index ededf2f..2622094 100644
--- a/src/base/circular_queue_unittest.cc
+++ b/src/base/circular_queue_unittest.cc
@@ -18,7 +18,7 @@
#include <random>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/copyable_ptr_unittest.cc b/src/base/copyable_ptr_unittest.cc
index 205dc77..ecbd1ef 100644
--- a/src/base/copyable_ptr_unittest.cc
+++ b/src/base/copyable_ptr_unittest.cc
@@ -16,7 +16,7 @@
#include "perfetto/base/copyable_ptr.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/metatrace_unittest.cc b/src/base/metatrace_unittest.cc
index 3fbf2db..88f1a67 100644
--- a/src/base/metatrace_unittest.cc
+++ b/src/base/metatrace_unittest.cc
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include <array>
#include <chrono>
#include <deque>
@@ -24,6 +21,7 @@
#include "perfetto/ext/base/metatrace.h"
#include "src/base/test/test_task_runner.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/base/no_destructor_unittest.cc b/src/base/no_destructor_unittest.cc
index 9c3460d..6fb8979 100644
--- a/src/base/no_destructor_unittest.cc
+++ b/src/base/no_destructor_unittest.cc
@@ -17,9 +17,8 @@
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/no_destructor.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/optional_unittest.cc b/src/base/optional_unittest.cc
index 7d7c3cc..9c073ec 100644
--- a/src/base/optional_unittest.cc
+++ b/src/base/optional_unittest.cc
@@ -19,8 +19,6 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include <memory>
#include <set>
#include <string>
@@ -28,6 +26,7 @@
#include "perfetto/ext/base/optional.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
using ::testing::ElementsAre;
diff --git a/src/base/paged_memory_unittest.cc b/src/base/paged_memory_unittest.cc
index 1ccea60..97f1a74 100644
--- a/src/base/paged_memory_unittest.cc
+++ b/src/base/paged_memory_unittest.cc
@@ -18,9 +18,9 @@
#include <stdint.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "src/base/test/vm_test_utils.h"
+#include "test/gtest_and_gmock.h"
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
!PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
diff --git a/src/base/scoped_file_unittest.cc b/src/base/scoped_file_unittest.cc
index 7c77641..13f1acb 100644
--- a/src/base/scoped_file_unittest.cc
+++ b/src/base/scoped_file_unittest.cc
@@ -29,7 +29,7 @@
#define TEST_INVALID_CLOSE
#endif
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/string_splitter_unittest.cc b/src/base/string_splitter_unittest.cc
index fa98434..eb80d35 100644
--- a/src/base/string_splitter_unittest.cc
+++ b/src/base/string_splitter_unittest.cc
@@ -18,8 +18,7 @@
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/string_utils_unittest.cc b/src/base/string_utils_unittest.cc
index 72471e7..58d0262 100644
--- a/src/base/string_utils_unittest.cc
+++ b/src/base/string_utils_unittest.cc
@@ -15,9 +15,7 @@
*/
#include "perfetto/ext/base/string_utils.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/string_view_unittest.cc b/src/base/string_view_unittest.cc
index 4e1ef06..b1e7bdf 100644
--- a/src/base/string_view_unittest.cc
+++ b/src/base/string_view_unittest.cc
@@ -20,8 +20,7 @@
#include <unordered_map>
#include <unordered_set>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/string_writer_unittest.cc b/src/base/string_writer_unittest.cc
index 12a7872..1df52bf 100644
--- a/src/base/string_writer_unittest.cc
+++ b/src/base/string_writer_unittest.cc
@@ -16,8 +16,7 @@
#include "perfetto/ext/base/string_writer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/task_runner_unittest.cc b/src/base/task_runner_unittest.cc
index 6eb01f6..a8368b5 100644
--- a/src/base/task_runner_unittest.cc
+++ b/src/base/task_runner_unittest.cc
@@ -16,7 +16,6 @@
#include "perfetto/ext/base/unix_task_runner.h"
-#include <gtest/gtest.h>
#include <thread>
#include "perfetto/base/build_config.h"
@@ -25,6 +24,7 @@
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/utils.h"
#include "src/base/test/gtest_test_suite.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/temp_file_unittest.cc b/src/base/temp_file_unittest.cc
index 8f5dc22..c2e2f4d 100644
--- a/src/base/temp_file_unittest.cc
+++ b/src/base/temp_file_unittest.cc
@@ -19,7 +19,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/test/gtest_test_suite.h b/src/base/test/gtest_test_suite.h
index b8b7561..4d1d550 100644
--- a/src/base/test/gtest_test_suite.h
+++ b/src/base/test/gtest_test_suite.h
@@ -17,7 +17,7 @@
#ifndef SRC_BASE_TEST_GTEST_TEST_SUITE_H_
#define SRC_BASE_TEST_GTEST_TEST_SUITE_H_
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
// Define newer TEST_SUITE googletest APIs as aliases of the older APIs where
// necessary. This makes it possible to migrate Perfetto to the newer APIs and
diff --git a/src/base/thread_checker_unittest.cc b/src/base/thread_checker_unittest.cc
index 46ffcd3..f63ec5d 100644
--- a/src/base/thread_checker_unittest.cc
+++ b/src/base/thread_checker_unittest.cc
@@ -21,7 +21,7 @@
#include <functional>
#include <memory>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/thread_task_runner_unittest.cc b/src/base/thread_task_runner_unittest.cc
index c4356fe..0e7f2af 100644
--- a/src/base/thread_task_runner_unittest.cc
+++ b/src/base/thread_task_runner_unittest.cc
@@ -18,8 +18,8 @@
#include <thread>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/thread_checker.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/time_unittest.cc b/src/base/time_unittest.cc
index cac79bd..31abf55 100644
--- a/src/base/time_unittest.cc
+++ b/src/base/time_unittest.cc
@@ -16,7 +16,7 @@
#include "perfetto/ext/base/time.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/unix_socket_unittest.cc b/src/base/unix_socket_unittest.cc
index e7b3d1a..8f54cab 100644
--- a/src/base/unix_socket_unittest.cc
+++ b/src/base/unix_socket_unittest.cc
@@ -24,8 +24,6 @@
#include <list>
#include <thread>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/file_utils.h"
@@ -34,6 +32,7 @@
#include "perfetto/ext/base/utils.h"
#include "src/base/test/test_task_runner.h"
#include "src/ipc/test/test_socket.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
@@ -424,7 +423,7 @@
EXPECT_EQ(geteuid(), static_cast<uint32_t>(srv_conn->peer_uid()));
#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- EXPECT_EQ(getpid(), static_cast<uint32_t>(srv_conn->peer_pid()));
+ EXPECT_EQ(getpid(), static_cast<pid_t>(srv_conn->peer_pid()));
#endif
srv_connected();
}));
@@ -454,7 +453,7 @@
EXPECT_EQ(geteuid(), static_cast<uint32_t>(srv_client_conn->peer_uid()));
#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
- EXPECT_EQ(getpid(), static_cast<uint32_t>(srv_client_conn->peer_pid()));
+ EXPECT_EQ(getpid(), static_cast<pid_t>(srv_client_conn->peer_pid()));
#endif
}
@@ -574,19 +573,19 @@
EXPECT_NE(hdr.msg_iov, nullptr);
EXPECT_EQ(hdr.msg_iov[0].iov_base, &hello[1]);
EXPECT_EQ(hdr.msg_iov[1].iov_base, &world[0]);
- EXPECT_EQ(hdr.msg_iovlen, 2);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 2);
EXPECT_STREQ(reinterpret_cast<char*>(hdr.msg_iov[0].iov_base), "ello");
EXPECT_EQ(iov[0].iov_len, base::ArraySize(hello) - 1);
UnixSocketRaw::ShiftMsgHdr(base::ArraySize(hello) - 1, &hdr);
EXPECT_EQ(hdr.msg_iov, &iov[1]);
- EXPECT_EQ(hdr.msg_iovlen, 1);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 1);
EXPECT_STREQ(reinterpret_cast<char*>(hdr.msg_iov[0].iov_base), world);
EXPECT_EQ(hdr.msg_iov[0].iov_len, base::ArraySize(world));
UnixSocketRaw::ShiftMsgHdr(base::ArraySize(world), &hdr);
EXPECT_EQ(hdr.msg_iov, nullptr);
- EXPECT_EQ(hdr.msg_iovlen, 0);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 0);
}
TEST_F(UnixSocketTest, ShiftMsgHdrSendFirstAndPartial) {
@@ -606,13 +605,13 @@
UnixSocketRaw::ShiftMsgHdr(base::ArraySize(hello) + 1, &hdr);
EXPECT_NE(hdr.msg_iov, nullptr);
- EXPECT_EQ(hdr.msg_iovlen, 1);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 1);
EXPECT_STREQ(reinterpret_cast<char*>(hdr.msg_iov[0].iov_base), "orld");
EXPECT_EQ(hdr.msg_iov[0].iov_len, base::ArraySize(world) - 1);
UnixSocketRaw::ShiftMsgHdr(base::ArraySize(world) - 1, &hdr);
EXPECT_EQ(hdr.msg_iov, nullptr);
- EXPECT_EQ(hdr.msg_iovlen, 0);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 0);
}
TEST_F(UnixSocketTest, ShiftMsgHdrSendEverything) {
@@ -633,7 +632,7 @@
UnixSocketRaw::ShiftMsgHdr(base::ArraySize(world) + base::ArraySize(hello),
&hdr);
EXPECT_EQ(hdr.msg_iov, nullptr);
- EXPECT_EQ(hdr.msg_iovlen, 0);
+ EXPECT_EQ(static_cast<int>(hdr.msg_iovlen), 0);
}
void Handler(int) {}
@@ -709,7 +708,7 @@
hdr.msg_iov = iov;
hdr.msg_iovlen = base::ArraySize(iov);
- ASSERT_EQ(send_sock.SendMsgAll(&hdr), sizeof(send_buf));
+ ASSERT_EQ(send_sock.SendMsgAll(&hdr), static_cast<ssize_t>(sizeof(send_buf)));
send_sock.Shutdown();
th.join();
// Make sure the re-entry logic was actually triggered.
@@ -743,7 +742,8 @@
char buf[sizeof("test")];
ASSERT_TRUE(raw_sock);
- ASSERT_EQ(raw_sock.Receive(buf, sizeof(buf)), sizeof(buf));
+ ASSERT_EQ(raw_sock.Receive(buf, sizeof(buf)),
+ static_cast<ssize_t>(sizeof(buf)));
ASSERT_STREQ(buf, "test");
}
diff --git a/src/base/utils_unittest.cc b/src/base/utils_unittest.cc
index a1c04af..5fcc27a 100644
--- a/src/base/utils_unittest.cc
+++ b/src/base/utils_unittest.cc
@@ -21,10 +21,9 @@
#include <stdint.h>
#include <unistd.h>
-#include <gtest/gtest.h>
-
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/pipe.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/uuid_unittest.cc b/src/base/uuid_unittest.cc
index aa03837..bbcf77b 100644
--- a/src/base/uuid_unittest.cc
+++ b/src/base/uuid_unittest.cc
@@ -16,7 +16,7 @@
#include "perfetto/ext/base/uuid.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/base/watchdog_unittest.cc b/src/base/watchdog_unittest.cc
index e8acaf7..f3bc850 100644
--- a/src/base/watchdog_unittest.cc
+++ b/src/base/watchdog_unittest.cc
@@ -16,11 +16,11 @@
#include "perfetto/ext/base/watchdog.h"
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/paged_memory.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/thread_utils.h"
+#include "test/gtest_and_gmock.h"
#include <signal.h>
#include <time.h>
diff --git a/src/base/weak_ptr_unittest.cc b/src/base/weak_ptr_unittest.cc
index 4b63d4e..1656574 100644
--- a/src/base/weak_ptr_unittest.cc
+++ b/src/base/weak_ptr_unittest.cc
@@ -16,7 +16,7 @@
#include "perfetto/ext/base/weak_ptr.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace base {
diff --git a/src/ipc/buffered_frame_deserializer_unittest.cc b/src/ipc/buffered_frame_deserializer_unittest.cc
index c9a74e2..727ee7e 100644
--- a/src/ipc/buffered_frame_deserializer_unittest.cc
+++ b/src/ipc/buffered_frame_deserializer_unittest.cc
@@ -19,9 +19,9 @@
#include <algorithm>
#include <string>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
#include "src/ipc/wire_protocol.pb.h"
diff --git a/src/ipc/client_impl_unittest.cc b/src/ipc/client_impl_unittest.cc
index 7fee3f0..84a9dd1 100644
--- a/src/ipc/client_impl_unittest.cc
+++ b/src/ipc/client_impl_unittest.cc
@@ -21,8 +21,6 @@
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/unix_socket.h"
@@ -32,6 +30,7 @@
#include "src/base/test/test_task_runner.h"
#include "src/ipc/buffered_frame_deserializer.h"
#include "src/ipc/test/test_socket.h"
+#include "test/gtest_and_gmock.h"
#include "src/ipc/test/client_unittest_messages.pb.h"
diff --git a/src/ipc/deferred_unittest.cc b/src/ipc/deferred_unittest.cc
index b927e14..e5ca890 100644
--- a/src/ipc/deferred_unittest.cc
+++ b/src/ipc/deferred_unittest.cc
@@ -16,8 +16,8 @@
#include "perfetto/ext/ipc/deferred.h"
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
+#include "test/gtest_and_gmock.h"
#include "src/ipc/test/deferred_unittest_messages.pb.h"
diff --git a/src/ipc/host_impl_unittest.cc b/src/ipc/host_impl_unittest.cc
index bc50e2c..025d4c1 100644
--- a/src/ipc/host_impl_unittest.cc
+++ b/src/ipc/host_impl_unittest.cc
@@ -18,8 +18,6 @@
#include <memory>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/temp_file.h"
@@ -30,6 +28,7 @@
#include "src/base/test/test_task_runner.h"
#include "src/ipc/buffered_frame_deserializer.h"
#include "src/ipc/test/test_socket.h"
+#include "test/gtest_and_gmock.h"
#include "src/ipc/test/client_unittest_messages.pb.h"
#include "src/ipc/wire_protocol.pb.h"
diff --git a/src/ipc/test/ipc_integrationtest.cc b/src/ipc/test/ipc_integrationtest.cc
index cfe5202..02a7e81 100644
--- a/src/ipc/test/ipc_integrationtest.cc
+++ b/src/ipc/test/ipc_integrationtest.cc
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/ipc/client.h"
#include "perfetto/ext/ipc/host.h"
#include "src/base/test/test_task_runner.h"
#include "src/ipc/test/test_socket.h"
+#include "test/gtest_and_gmock.h"
#include "src/ipc/test/greeter_service.ipc.h"
#include "src/ipc/test/greeter_service.pb.h"
diff --git a/src/perfetto_cmd/config_unittest.cc b/src/perfetto_cmd/config_unittest.cc
index 41ccbb8..c9e79b6 100644
--- a/src/perfetto_cmd/config_unittest.cc
+++ b/src/perfetto_cmd/config_unittest.cc
@@ -16,8 +16,7 @@
#include "src/perfetto_cmd/config.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
#include "perfetto/config/trace_config.pb.h"
@@ -41,43 +40,43 @@
TEST_F(CreateConfigFromOptionsTest, MilliSeconds) {
options.time = "2ms";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.duration_ms(), 2);
+ EXPECT_EQ(config.duration_ms(), 2u);
}
TEST_F(CreateConfigFromOptionsTest, Seconds) {
options.time = "100s";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.duration_ms(), 100 * 1000);
+ EXPECT_EQ(config.duration_ms(), 100 * 1000u);
}
TEST_F(CreateConfigFromOptionsTest, Minutes) {
options.time = "2m";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.duration_ms(), 2 * 60 * 1000);
+ EXPECT_EQ(config.duration_ms(), 2 * 60 * 1000u);
}
TEST_F(CreateConfigFromOptionsTest, Hours) {
options.time = "2h";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.duration_ms(), 2 * 60 * 60 * 1000);
+ EXPECT_EQ(config.duration_ms(), 2 * 60 * 60 * 1000u);
}
TEST_F(CreateConfigFromOptionsTest, Kilobyte) {
options.buffer_size = "2kb";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 2);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 2u);
}
TEST_F(CreateConfigFromOptionsTest, Megabyte) {
options.buffer_size = "2mb";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 2 * 1024);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 2 * 1024u);
}
TEST_F(CreateConfigFromOptionsTest, Gigabyte) {
options.buffer_size = "2gb";
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 2 * 1024 * 1024);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 2 * 1024 * 1024u);
}
TEST_F(CreateConfigFromOptionsTest, BadTrailingSpace) {
@@ -123,12 +122,12 @@
options.categories.push_back("sched/sched_switch");
options.atrace_apps.push_back("com.android.chrome");
ASSERT_TRUE(CreateConfigFromOptions(options, &config));
- EXPECT_EQ(config.duration_ms(), 60 * 60 * 1000);
- EXPECT_EQ(config.flush_period_ms(), 30 * 1000);
- EXPECT_EQ(config.max_file_size_bytes(), 1 * 1024 * 1024 * 1024);
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 100 * 1024);
+ EXPECT_EQ(config.duration_ms(), 60 * 60 * 1000u);
+ EXPECT_EQ(config.flush_period_ms(), 30 * 1000u);
+ EXPECT_EQ(config.max_file_size_bytes(), 1 * 1024 * 1024 * 1024u);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 100 * 1024u);
EXPECT_EQ(config.data_sources().Get(0).config().name(), "linux.ftrace");
- EXPECT_EQ(config.data_sources().Get(0).config().target_buffer(), 0);
+ EXPECT_EQ(config.data_sources().Get(0).config().target_buffer(), 0u);
auto ftrace = config.data_sources().Get(0).config().ftrace_config();
EXPECT_THAT(ftrace.ftrace_events(), Contains("sched/sched_switch"));
EXPECT_THAT(ftrace.atrace_categories(), Contains("sw"));
diff --git a/src/perfetto_cmd/packet_writer_unittest.cc b/src/perfetto_cmd/packet_writer_unittest.cc
index 28ac41f..a17f25a 100644
--- a/src/perfetto_cmd/packet_writer_unittest.cc
+++ b/src/perfetto_cmd/packet_writer_unittest.cc
@@ -21,8 +21,6 @@
#include <random>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include <zlib.h>
#include "perfetto/ext/base/file_utils.h"
@@ -35,6 +33,7 @@
#include "perfetto/trace/trace_packet.pb.h"
#include "perfetto/trace/trace_packet.pbzero.h"
#include "src/perfetto_cmd/packet_writer.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
@@ -99,7 +98,7 @@
fseek(f, 0, SEEK_SET);
std::string s;
EXPECT_TRUE(base::ReadFileStream(f, &s));
- EXPECT_GT(s.size(), 0);
+ EXPECT_GT(s.size(), 0u);
protos::Trace trace;
EXPECT_TRUE(trace.ParseFromString(s));
@@ -127,13 +126,13 @@
std::string s;
fseek(f, 0, SEEK_SET);
EXPECT_TRUE(base::ReadFileStream(f, &s));
- EXPECT_GT(s.size(), 0);
+ EXPECT_GT(s.size(), 0u);
protos::Trace trace;
EXPECT_TRUE(trace.ParseFromString(s));
const std::string& data = trace.packet().Get(0).compressed_packets();
- EXPECT_GT(data.size(), 0);
+ EXPECT_GT(data.size(), 0u);
protos::Trace subtrace;
EXPECT_TRUE(subtrace.ParseFromString(Decompress(data)));
@@ -197,10 +196,10 @@
}
std::string s;
- EXPECT_LT(fseek(f, 0, SEEK_END), uncompressed_size);
+ EXPECT_LT(fseek(f, 0, SEEK_END), static_cast<int>(uncompressed_size));
fseek(f, 0, SEEK_SET);
EXPECT_TRUE(base::ReadFileStream(f, &s));
- EXPECT_GT(s.size(), 0);
+ EXPECT_GT(s.size(), 0u);
protos::Trace trace;
EXPECT_TRUE(trace.ParseFromString(s));
@@ -208,8 +207,8 @@
size_t packet_count = 0;
for (const auto& packet : trace.packet()) {
const std::string& data = packet.compressed_packets();
- EXPECT_GT(data.size(), 0);
- EXPECT_LT(data.size(), 500 * 1024);
+ EXPECT_GT(data.size(), 0u);
+ EXPECT_LT(data.size(), 500 * 1024u);
protos::Trace subtrace;
EXPECT_TRUE(subtrace.ParseFromString(Decompress(data)));
for (const auto& subpacket : subtrace.packet()) {
@@ -218,7 +217,7 @@
}
}
- EXPECT_EQ(packet_count, 200 * 2);
+ EXPECT_EQ(packet_count, 200 * 2u);
}
TEST(PacketWriter, ZipPacketWriter_ShouldSplitPackets) {
@@ -257,7 +256,7 @@
std::string s;
fseek(f, 0, SEEK_SET);
EXPECT_TRUE(base::ReadFileStream(f, &s));
- EXPECT_GT(s.size(), 0);
+ EXPECT_GT(s.size(), 0u);
protos::Trace trace;
EXPECT_TRUE(trace.ParseFromString(s));
@@ -265,8 +264,8 @@
size_t packet_count = 0;
for (const auto& packet : trace.packet()) {
const std::string& data = packet.compressed_packets();
- EXPECT_GT(data.size(), 0);
- EXPECT_LT(data.size(), 500 * 1024);
+ EXPECT_GT(data.size(), 0u);
+ EXPECT_LT(data.size(), 500 * 1024u);
protos::Trace subtrace;
EXPECT_TRUE(subtrace.ParseFromString(Decompress(data)));
for (const auto& subpacket : subtrace.packet()) {
@@ -274,7 +273,7 @@
}
}
- EXPECT_EQ(packet_count, 1000);
+ EXPECT_EQ(packet_count, 1000u);
}
} // namespace
diff --git a/src/perfetto_cmd/pbtxt_to_pb_unittest.cc b/src/perfetto_cmd/pbtxt_to_pb_unittest.cc
index 3fbeb87..2f35902 100644
--- a/src/perfetto_cmd/pbtxt_to_pb_unittest.cc
+++ b/src/perfetto_cmd/pbtxt_to_pb_unittest.cc
@@ -19,8 +19,7 @@
#include <memory>
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
#include "perfetto/config/trace_config.pb.h"
@@ -62,7 +61,7 @@
protos::TraceConfig config = ToProto(R"(
duration_ms: 1234
)");
- EXPECT_EQ(config.duration_ms(), 1234);
+ EXPECT_EQ(config.duration_ms(), 1234u);
}
TEST(PbtxtToPb, TwoFields) {
@@ -70,8 +69,8 @@
duration_ms: 1234
file_write_period_ms: 5678
)");
- EXPECT_EQ(config.duration_ms(), 1234);
- EXPECT_EQ(config.file_write_period_ms(), 5678);
+ EXPECT_EQ(config.duration_ms(), 1234u);
+ EXPECT_EQ(config.file_write_period_ms(), 5678u);
}
TEST(PbtxtToPb, Semicolons) {
@@ -79,8 +78,8 @@
duration_ms: 1234;
file_write_period_ms: 5678;
)");
- EXPECT_EQ(config.duration_ms(), 1234);
- EXPECT_EQ(config.file_write_period_ms(), 5678);
+ EXPECT_EQ(config.duration_ms(), 1234u);
+ EXPECT_EQ(config.file_write_period_ms(), 5678u);
}
TEST(PbtxtToPb, NestedMessage) {
@@ -90,7 +89,7 @@
}
)");
ASSERT_EQ(config.buffers().size(), 1);
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 123);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 123u);
}
TEST(PbtxtToPb, SplitNested) {
@@ -104,9 +103,9 @@
}
)");
ASSERT_EQ(config.buffers().size(), 2);
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 1);
- EXPECT_EQ(config.buffers().Get(1).size_kb(), 2);
- EXPECT_EQ(config.duration_ms(), 1000);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 1u);
+ EXPECT_EQ(config.buffers().Get(1).size_kb(), 2u);
+ EXPECT_EQ(config.duration_ms(), 1000u);
}
TEST(PbtxtToPb, MultipleNestedMessage) {
@@ -119,8 +118,8 @@
}
)");
ASSERT_EQ(config.buffers().size(), 2);
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 1);
- EXPECT_EQ(config.buffers().Get(1).size_kb(), 2);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 1u);
+ EXPECT_EQ(config.buffers().Get(1).size_kb(), 2u);
}
TEST(PbtxtToPb, NestedMessageCrossFile) {
@@ -135,7 +134,7 @@
)");
ASSERT_EQ(
config.data_sources().Get(0).config().ftrace_config().drain_period_ms(),
- 42);
+ 42u);
}
TEST(PbtxtToPb, Booleans) {
@@ -207,16 +206,16 @@
)");
const auto& fields =
config.data_sources().Get(0).config().for_testing().dummy_fields();
- ASSERT_EQ(fields.field_uint32(), 1);
- ASSERT_EQ(fields.field_uint64(), 2);
+ ASSERT_EQ(fields.field_uint32(), 1u);
+ ASSERT_EQ(fields.field_uint64(), 2u);
ASSERT_EQ(fields.field_int32(), 3);
ASSERT_EQ(fields.field_int64(), 4);
- ASSERT_EQ(fields.field_fixed64(), 5);
+ ASSERT_EQ(fields.field_fixed64(), 5u);
ASSERT_EQ(fields.field_sfixed64(), 6);
- ASSERT_EQ(fields.field_fixed32(), 7);
+ ASSERT_EQ(fields.field_fixed32(), 7u);
ASSERT_EQ(fields.field_sfixed32(), 8);
- ASSERT_EQ(fields.field_double(), 9);
- ASSERT_EQ(fields.field_float(), 10);
+ ASSERT_DOUBLE_EQ(fields.field_double(), 9);
+ ASSERT_FLOAT_EQ(fields.field_float(), 10);
ASSERT_EQ(fields.field_sint64(), 11);
ASSERT_EQ(fields.field_sint32(), 12);
ASSERT_EQ(fields.field_string(), "13");
@@ -248,19 +247,19 @@
config.data_sources().Get(0).config().for_testing().dummy_fields();
ASSERT_EQ(fields.field_int32(), -1);
ASSERT_EQ(fields.field_int64(), -2);
- ASSERT_EQ(fields.field_fixed64(), -3);
+ ASSERT_EQ(fields.field_fixed64(), static_cast<uint64_t>(-3));
ASSERT_EQ(fields.field_sfixed64(), -4);
- ASSERT_EQ(fields.field_fixed32(), -5);
+ ASSERT_EQ(fields.field_fixed32(), static_cast<uint32_t>(-5));
ASSERT_EQ(fields.field_sfixed32(), -6);
- ASSERT_EQ(fields.field_double(), -7);
- ASSERT_EQ(fields.field_float(), -8);
+ ASSERT_DOUBLE_EQ(fields.field_double(), -7);
+ ASSERT_FLOAT_EQ(fields.field_float(), -8);
ASSERT_EQ(fields.field_sint64(), -9);
ASSERT_EQ(fields.field_sint32(), -10);
}
TEST(PbtxtToPb, EofEndsNumeric) {
protos::TraceConfig config = ToProto(R"(duration_ms: 1234)");
- EXPECT_EQ(config.duration_ms(), 1234);
+ EXPECT_EQ(config.duration_ms(), 1234u);
}
TEST(PbtxtToPb, EofEndsIdentifier) {
@@ -320,10 +319,10 @@
duration_ms: 10000
)");
- EXPECT_EQ(config.duration_ms(), 10000);
- EXPECT_EQ(config.buffers().Get(0).size_kb(), 100024);
+ EXPECT_EQ(config.duration_ms(), 10000u);
+ EXPECT_EQ(config.buffers().Get(0).size_kb(), 100024u);
EXPECT_EQ(config.data_sources().Get(0).config().name(), "linux.ftrace");
- EXPECT_EQ(config.data_sources().Get(0).config().target_buffer(), 0);
+ EXPECT_EQ(config.data_sources().Get(0).config().target_buffer(), 0u);
EXPECT_EQ(config.producers().Get(0).producer_name(),
"perfetto.traced_probes");
}
diff --git a/src/perfetto_cmd/rate_limiter_unittest.cc b/src/perfetto_cmd/rate_limiter_unittest.cc
index 839c879..48507f4 100644
--- a/src/perfetto_cmd/rate_limiter_unittest.cc
+++ b/src/perfetto_cmd/rate_limiter_unittest.cc
@@ -23,8 +23,7 @@
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/utils.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
using testing::_;
using testing::NiceMock;
diff --git a/src/profiling/memory/bookkeeping_unittest.cc b/src/profiling/memory/bookkeeping_unittest.cc
index 79f6720..de6bf34 100644
--- a/src/profiling/memory/bookkeeping_unittest.cc
+++ b/src/profiling/memory/bookkeeping_unittest.cc
@@ -16,8 +16,7 @@
#include "src/profiling/memory/bookkeeping.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
@@ -62,18 +61,18 @@
sequence_number++;
hd.RecordMalloc(stack2(), 2, 2, 2, sequence_number, 100 * sequence_number);
sequence_number++;
- ASSERT_EQ(hd.GetSizeForTesting(stack()), 5);
- ASSERT_EQ(hd.GetSizeForTesting(stack2()), 2);
+ ASSERT_EQ(hd.GetSizeForTesting(stack()), 5u);
+ ASSERT_EQ(hd.GetSizeForTesting(stack2()), 2u);
ASSERT_EQ(hd.GetTimestampForTesting(), 100 * (sequence_number - 1));
hd.RecordFree(2, sequence_number, 100 * sequence_number);
sequence_number++;
- ASSERT_EQ(hd.GetSizeForTesting(stack()), 5);
- ASSERT_EQ(hd.GetSizeForTesting(stack2()), 0);
+ ASSERT_EQ(hd.GetSizeForTesting(stack()), 5u);
+ ASSERT_EQ(hd.GetSizeForTesting(stack2()), 0u);
ASSERT_EQ(hd.GetTimestampForTesting(), 100 * (sequence_number - 1));
hd.RecordFree(1, sequence_number, 100 * sequence_number);
sequence_number++;
- ASSERT_EQ(hd.GetSizeForTesting(stack()), 0);
- ASSERT_EQ(hd.GetSizeForTesting(stack2()), 0);
+ ASSERT_EQ(hd.GetSizeForTesting(stack()), 0u);
+ ASSERT_EQ(hd.GetSizeForTesting(stack2()), 0u);
ASSERT_EQ(hd.GetTimestampForTesting(), 100 * (sequence_number - 1));
}
@@ -90,9 +89,9 @@
sequence_number++;
hd.RecordFree(1, sequence_number, 100 * sequence_number);
sequence_number++;
- ASSERT_EQ(hd.max_timestamp(), 200);
- ASSERT_EQ(hd.GetMaxForTesting(stack()), 5);
- ASSERT_EQ(hd.GetMaxForTesting(stack2()), 2);
+ ASSERT_EQ(hd.max_timestamp(), 200u);
+ ASSERT_EQ(hd.GetMaxForTesting(stack()), 5u);
+ ASSERT_EQ(hd.GetMaxForTesting(stack2()), 2u);
}
TEST(BookkeepingTest, TwoHeapTrackers) {
@@ -105,11 +104,11 @@
hd.RecordMalloc(stack(), 1, 5, 5, sequence_number, 100 * sequence_number);
hd2.RecordMalloc(stack(), 2, 2, 2, sequence_number, 100 * sequence_number);
sequence_number++;
- ASSERT_EQ(hd2.GetSizeForTesting(stack()), 2);
- ASSERT_EQ(hd.GetSizeForTesting(stack()), 5);
+ ASSERT_EQ(hd2.GetSizeForTesting(stack()), 2u);
+ ASSERT_EQ(hd.GetSizeForTesting(stack()), 5u);
ASSERT_EQ(hd.GetTimestampForTesting(), 100 * (sequence_number - 1));
}
- ASSERT_EQ(hd.GetSizeForTesting(stack()), 5);
+ ASSERT_EQ(hd.GetSizeForTesting(stack()), 5u);
}
TEST(BookkeepingTest, ReplaceAlloc) {
@@ -121,8 +120,8 @@
sequence_number++;
hd.RecordMalloc(stack2(), 1, 2, 2, sequence_number, 100 * sequence_number);
sequence_number++;
- EXPECT_EQ(hd.GetSizeForTesting(stack()), 0);
- EXPECT_EQ(hd.GetSizeForTesting(stack2()), 2);
+ EXPECT_EQ(hd.GetSizeForTesting(stack()), 0u);
+ EXPECT_EQ(hd.GetSizeForTesting(stack2()), 2u);
ASSERT_EQ(hd.GetTimestampForTesting(), 100 * (sequence_number - 1));
}
@@ -132,8 +131,8 @@
hd.RecordMalloc(stack(), 1, 5, 5, 2, 2);
hd.RecordMalloc(stack2(), 1, 2, 2, 1, 1);
- EXPECT_EQ(hd.GetSizeForTesting(stack()), 5);
- EXPECT_EQ(hd.GetSizeForTesting(stack2()), 0);
+ EXPECT_EQ(hd.GetSizeForTesting(stack()), 5u);
+ EXPECT_EQ(hd.GetSizeForTesting(stack2()), 0u);
}
TEST(BookkeepingTest, ManyAllocations) {
@@ -153,7 +152,7 @@
hd.RecordMalloc(stack(), addr, 5, 5, sequence_number, sequence_number);
sequence_number++;
batch_frees.emplace_back(addr, sequence_number++);
- ASSERT_THAT(hd.GetSizeForTesting(stack()), AnyOf(Eq(0), Eq(5)));
+ ASSERT_THAT(hd.GetSizeForTesting(stack()), AnyOf(Eq(0u), Eq(5u)));
}
}
diff --git a/src/profiling/memory/client_unittest.cc b/src/profiling/memory/client_unittest.cc
index fb790ac..e2f0500 100644
--- a/src/profiling/memory/client_unittest.cc
+++ b/src/profiling/memory/client_unittest.cc
@@ -16,11 +16,11 @@
#include "src/profiling/memory/client.h"
-#include <gtest/gtest.h>
+#include <thread>
+
#include "perfetto/ext/base/thread_utils.h"
#include "perfetto/ext/base/unix_socket.h"
-
-#include <thread>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
diff --git a/src/profiling/memory/heapprofd_end_to_end_test.cc b/src/profiling/memory/heapprofd_end_to_end_test.cc
index b1b9c63..e75eaf7 100644
--- a/src/profiling/memory/heapprofd_end_to_end_test.cc
+++ b/src/profiling/memory/heapprofd_end_to_end_test.cc
@@ -18,15 +18,13 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/pipe.h"
#include "perfetto/ext/tracing/ipc/default_socket.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "src/base/test/test_task_runner.h"
#include "src/profiling/memory/heapprofd_producer.h"
+#include "test/gtest_and_gmock.h"
#include "test/test_helper.h"
#include "perfetto/config/profiling/heapprofd_config.pbzero.h"
@@ -247,10 +245,10 @@
if (dump.pid() != pid)
continue;
for (const auto& sample : dump.samples()) {
- EXPECT_EQ(sample.self_allocated() % alloc_size, 0);
- EXPECT_EQ(sample.self_freed() % alloc_size, 0);
+ EXPECT_EQ(sample.self_allocated() % alloc_size, 0u);
+ EXPECT_EQ(sample.self_freed() % alloc_size, 0u);
EXPECT_THAT(sample.self_allocated() - sample.self_freed(),
- AnyOf(Eq(0), Eq(alloc_size)));
+ AnyOf(Eq(0u), Eq(alloc_size)));
}
}
}
@@ -301,10 +299,10 @@
profile_packets++;
}
}
- EXPECT_GT(profile_packets, 0);
- EXPECT_GT(samples, 0);
- EXPECT_GT(last_allocated, 0);
- EXPECT_GT(last_freed, 0);
+ EXPECT_GT(profile_packets, 0u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(last_allocated, 0u);
+ EXPECT_GT(last_freed, 0u);
}
void ValidateOnlyPID(TestHelper* helper, uint64_t pid) {
@@ -316,7 +314,7 @@
dumps++;
}
}
- EXPECT_GT(dumps, 0);
+ EXPECT_GT(dumps, 0u);
}
};
@@ -485,7 +483,7 @@
const auto& dumps = packet.profile_packet().process_dumps();
ASSERT_EQ(dumps.size(), 1);
const protos::ProfilePacket_ProcessHeapSamples& dump = dumps.Get(0);
- EXPECT_EQ(dump.pid(), pid);
+ EXPECT_EQ(static_cast<pid_t>(dump.pid()), pid);
profile_packets++;
for (const auto& sample : dump.samples()) {
samples++;
@@ -494,10 +492,10 @@
}
}
}
- EXPECT_EQ(profile_packets, 1);
- EXPECT_GT(samples, 0);
- EXPECT_GT(total_allocated, 0);
- EXPECT_GT(total_freed, 0);
+ EXPECT_EQ(profile_packets, 1u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(total_allocated, 0u);
+ EXPECT_GT(total_freed, 0u);
}
TEST_P(HeapprofdEndToEnd, NativeStartupDenormalizedCmdline) {
@@ -566,7 +564,7 @@
const auto& dumps = packet.profile_packet().process_dumps();
ASSERT_EQ(dumps.size(), 1);
const protos::ProfilePacket_ProcessHeapSamples& dump = dumps.Get(0);
- EXPECT_EQ(dump.pid(), pid);
+ EXPECT_EQ(static_cast<pid_t>(dump.pid()), pid);
profile_packets++;
for (const auto& sample : dump.samples()) {
samples++;
@@ -575,10 +573,10 @@
}
}
}
- EXPECT_EQ(profile_packets, 1);
- EXPECT_GT(samples, 0);
- EXPECT_GT(total_allocated, 0);
- EXPECT_GT(total_freed, 0);
+ EXPECT_EQ(profile_packets, 1u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(total_allocated, 0u);
+ EXPECT_GT(total_freed, 0u);
}
TEST_P(HeapprofdEndToEnd, DiscoverByName) {
@@ -643,7 +641,7 @@
const auto& dumps = packet.profile_packet().process_dumps();
ASSERT_EQ(dumps.size(), 1);
const protos::ProfilePacket_ProcessHeapSamples& dump = dumps.Get(0);
- EXPECT_EQ(dump.pid(), pid);
+ EXPECT_EQ(static_cast<pid_t>(dump.pid()), pid);
profile_packets++;
for (const auto& sample : dump.samples()) {
samples++;
@@ -652,10 +650,10 @@
}
}
}
- EXPECT_EQ(profile_packets, 1);
- EXPECT_GT(samples, 0);
- EXPECT_GT(total_allocated, 0);
- EXPECT_GT(total_freed, 0);
+ EXPECT_EQ(profile_packets, 1u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(total_allocated, 0u);
+ EXPECT_GT(total_freed, 0u);
}
TEST_P(HeapprofdEndToEnd, DiscoverByNameDenormalizedCmdline) {
@@ -720,7 +718,7 @@
const auto& dumps = packet.profile_packet().process_dumps();
ASSERT_EQ(dumps.size(), 1);
const protos::ProfilePacket_ProcessHeapSamples& dump = dumps.Get(0);
- EXPECT_EQ(dump.pid(), pid);
+ EXPECT_EQ(static_cast<pid_t>(dump.pid()), pid);
profile_packets++;
for (const auto& sample : dump.samples()) {
samples++;
@@ -729,10 +727,10 @@
}
}
}
- EXPECT_EQ(profile_packets, 1);
- EXPECT_GT(samples, 0);
- EXPECT_GT(total_allocated, 0);
- EXPECT_GT(total_freed, 0);
+ EXPECT_EQ(profile_packets, 1u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(total_allocated, 0u);
+ EXPECT_GT(total_freed, 0u);
}
TEST_P(HeapprofdEndToEnd, ReInit) {
@@ -944,7 +942,7 @@
const auto& dumps = packet.profile_packet().process_dumps();
ASSERT_EQ(dumps.size(), 1);
const protos::ProfilePacket_ProcessHeapSamples& dump = dumps.Get(0);
- EXPECT_EQ(dump.pid(), pid);
+ EXPECT_EQ(static_cast<pid_t>(dump.pid()), pid);
profile_packets++;
for (const auto& sample : dump.samples()) {
samples++;
@@ -952,9 +950,9 @@
}
}
}
- EXPECT_EQ(profile_packets, 1);
- EXPECT_GT(samples, 0);
- EXPECT_GT(total_allocated, 0);
+ EXPECT_EQ(profile_packets, 1u);
+ EXPECT_GT(samples, 0u);
+ EXPECT_GT(total_allocated, 0u);
}
// This test only works when run on Android using an Android Q version of
diff --git a/src/profiling/memory/heapprofd_producer_unittest.cc b/src/profiling/memory/heapprofd_producer_unittest.cc
index 0f67b0e..66bd452 100644
--- a/src/profiling/memory/heapprofd_producer_unittest.cc
+++ b/src/profiling/memory/heapprofd_producer_unittest.cc
@@ -16,14 +16,11 @@
#include "src/profiling/memory/heapprofd_producer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/ext/tracing/core/basic_types.h"
#include "perfetto/ext/tracing/core/commit_data_request.h"
#include "perfetto/tracing/core/data_source_descriptor.h"
-
#include "src/base/test/test_task_runner.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
diff --git a/src/profiling/memory/interner_unittest.cc b/src/profiling/memory/interner_unittest.cc
index b7ffb5f..e43b348 100644
--- a/src/profiling/memory/interner_unittest.cc
+++ b/src/profiling/memory/interner_unittest.cc
@@ -16,8 +16,7 @@
#include "src/profiling/memory/interner.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
@@ -29,7 +28,7 @@
Interned<std::string> interned_str = interner.Intern("foo");
ASSERT_EQ(interned_str.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
TEST(InternerStringTest, TwoStrings) {
@@ -40,7 +39,7 @@
ASSERT_EQ(interned_str.data(), "foo");
ASSERT_EQ(other_interned_str.data(), "bar");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
TEST(InternerStringTest, TwoReferences) {
@@ -49,10 +48,10 @@
Interned<std::string> interned_str = interner.Intern("foo");
ASSERT_EQ(interned_str.data(), "foo");
Interned<std::string> interned_str2 = interner.Intern("foo");
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str2.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
TEST(InternerStringTest, Move) {
@@ -61,10 +60,10 @@
Interned<std::string> interned_str = interner.Intern("foo");
{
Interned<std::string> interned_str2(std::move(interned_str));
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str2.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
}
@@ -74,10 +73,10 @@
Interned<std::string> interned_str = interner.Intern("foo");
{
Interned<std::string> interned_str2(interned_str);
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str2.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str.data(), "foo");
}
}
@@ -88,10 +87,10 @@
Interned<std::string> interned_str = interner.Intern("foo");
{
Interned<std::string> interned_str2 = std::move(interned_str);
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str2.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
}
@@ -101,10 +100,10 @@
Interned<std::string> interned_str = interner.Intern("foo");
{
Interned<std::string> interned_str2 = interned_str;
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str2.data(), "foo");
}
- ASSERT_EQ(interner.entry_count_for_testing(), 1);
+ ASSERT_EQ(interner.entry_count_for_testing(), 1u);
ASSERT_EQ(interned_str.data(), "foo");
}
}
@@ -126,7 +125,7 @@
Interned<std::string> other_interned_str = interner.Intern("bar");
ASSERT_EQ(interned_str.id() + 1, other_interned_str.id());
}
- ASSERT_EQ(interner.entry_count_for_testing(), 0);
+ ASSERT_EQ(interner.entry_count_for_testing(), 0u);
}
} // namespace
diff --git a/src/profiling/memory/page_idle_checker_unittest.cc b/src/profiling/memory/page_idle_checker_unittest.cc
index 1de479c..ee751e9 100644
--- a/src/profiling/memory/page_idle_checker_unittest.cc
+++ b/src/profiling/memory/page_idle_checker_unittest.cc
@@ -16,25 +16,24 @@
#include "src/profiling/memory/page_idle_checker.h"
-#include <gtest/gtest.h>
-
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
namespace {
TEST(PageIdleCheckerTest, AllOnFirstPageAligned) {
- EXPECT_EQ(GetFirstPageShare(0, 10), 10);
+ EXPECT_EQ(GetFirstPageShare(0, 10), 10u);
}
TEST(PageIdleCheckerTest, AllOnFirstPageUnAligned) {
- EXPECT_EQ(GetFirstPageShare(10, 10), 10);
+ EXPECT_EQ(GetFirstPageShare(10, 10), 10u);
}
TEST(PageIdleCheckerTest, WholeFirstPageAligned) {
EXPECT_EQ(GetFirstPageShare(0, base::kPageSize + 10), base::kPageSize);
- EXPECT_EQ(GetLastPageShare(0, base::kPageSize + 10), 10);
+ EXPECT_EQ(GetLastPageShare(0, base::kPageSize + 10), 10u);
}
TEST(PageIdleCheckerTest, WholeLastPageAligned) {
@@ -45,7 +44,7 @@
TEST(PageIdleCheckerTest, SomeFirstAndLast) {
EXPECT_EQ(GetFirstPageShare(10, 3 * base::kPageSize + 10),
base::kPageSize - 10);
- EXPECT_EQ(GetLastPageShare(10, 3 * base::kPageSize + 10), 20);
+ EXPECT_EQ(GetLastPageShare(10, 3 * base::kPageSize + 10), 20u);
}
} // namespace
diff --git a/src/profiling/memory/proc_utils_unittest.cc b/src/profiling/memory/proc_utils_unittest.cc
index cc89dd6..b011e4f 100644
--- a/src/profiling/memory/proc_utils_unittest.cc
+++ b/src/profiling/memory/proc_utils_unittest.cc
@@ -16,10 +16,8 @@
#include "src/profiling/memory/proc_utils.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
diff --git a/src/profiling/memory/sampler_unittest.cc b/src/profiling/memory/sampler_unittest.cc
index 0bd45fb..db903ff 100644
--- a/src/profiling/memory/sampler_unittest.cc
+++ b/src/profiling/memory/sampler_unittest.cc
@@ -16,29 +16,29 @@
#include "src/profiling/memory/sampler.h"
-#include <gtest/gtest.h>
-
#include <thread>
+#include "test/gtest_and_gmock.h"
+
namespace perfetto {
namespace profiling {
namespace {
TEST(SamplerTest, TestLarge) {
Sampler sampler(512);
- EXPECT_EQ(sampler.SampleSize(1024), 1024);
+ EXPECT_EQ(sampler.SampleSize(1024), 1024u);
}
TEST(SamplerTest, TestSmall) {
Sampler sampler(512);
- EXPECT_EQ(sampler.SampleSize(511), 512);
+ EXPECT_EQ(sampler.SampleSize(511), 512u);
}
TEST(SamplerTest, TestSequence) {
Sampler sampler(1);
- EXPECT_EQ(sampler.SampleSize(3), 3);
- EXPECT_EQ(sampler.SampleSize(7), 7);
- EXPECT_EQ(sampler.SampleSize(5), 5);
+ EXPECT_EQ(sampler.SampleSize(3), 3u);
+ EXPECT_EQ(sampler.SampleSize(7), 7u);
+ EXPECT_EQ(sampler.SampleSize(5), 5u);
}
} // namespace
diff --git a/src/profiling/memory/shared_ring_buffer_unittest.cc b/src/profiling/memory/shared_ring_buffer_unittest.cc
index e11ae67..df1bc5c 100644
--- a/src/profiling/memory/shared_ring_buffer_unittest.cc
+++ b/src/profiling/memory/shared_ring_buffer_unittest.cc
@@ -22,8 +22,8 @@
#include <thread>
#include <unordered_map>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/optional.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
@@ -61,13 +61,13 @@
{
auto buf_and_size = rd->BeginRead();
- ASSERT_EQ(buf_and_size.size, 4);
+ ASSERT_EQ(buf_and_size.size, 4u);
ASSERT_STREQ(reinterpret_cast<const char*>(&buf_and_size.data[0]), "foo");
rd->EndRead(std::move(buf_and_size));
}
{
auto buf_and_size = rd->BeginRead();
- ASSERT_EQ(buf_and_size.size, 4);
+ ASSERT_EQ(buf_and_size.size, 4u);
ASSERT_STREQ(reinterpret_cast<const char*>(&buf_and_size.data[0]), "bar");
rd->EndRead(std::move(buf_and_size));
}
@@ -75,7 +75,7 @@
for (int i = 0; i < 3; i++) {
auto buf_and_size = rd->BeginRead();
ASSERT_EQ(buf_and_size.data, nullptr);
- ASSERT_EQ(buf_and_size.size, 0);
+ ASSERT_EQ(buf_and_size.size, 0u);
}
// Test extremely large writes (fill the buffer)
@@ -204,7 +204,7 @@
std::uniform_int_distribution<size_t> dist(1, base::kPageSize * 8);
for (int i = 0; i < 1000; i++) {
size_t size = dist(rnd_engine);
- ASSERT_GT(size, 0);
+ ASSERT_GT(size, 0u);
std::string data;
data.resize(size);
std::generate(data.begin(), data.end(), rnd_engine);
@@ -230,7 +230,7 @@
continue;
}
}
- ASSERT_GT(buf_and_size.size, 0);
+ ASSERT_GT(buf_and_size.size, 0u);
std::string data = ToString(buf_and_size);
std::lock_guard<std::mutex> lock(mutex);
expected_contents[std::move(data)]--;
diff --git a/src/profiling/memory/system_property_unittest.cc b/src/profiling/memory/system_property_unittest.cc
index 8ddf601..90a015b 100644
--- a/src/profiling/memory/system_property_unittest.cc
+++ b/src/profiling/memory/system_property_unittest.cc
@@ -16,8 +16,7 @@
#include "src/profiling/memory/system_property.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
diff --git a/src/profiling/memory/unwinding_unittest.cc b/src/profiling/memory/unwinding_unittest.cc
index 881d809..a3c45db 100644
--- a/src/profiling/memory/unwinding_unittest.cc
+++ b/src/profiling/memory/unwinding_unittest.cc
@@ -15,20 +15,18 @@
*/
#include "src/profiling/memory/unwinding.h"
-#include "perfetto/ext/base/scoped_file.h"
-#include "src/profiling/memory/client.h"
-#include "src/profiling/memory/wire_protocol.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include <cxxabi.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
-
#include <unwindstack/RegsGetLocal.h>
+#include "perfetto/ext/base/scoped_file.h"
+#include "src/profiling/memory/client.h"
+#include "src/profiling/memory/wire_protocol.h"
+#include "test/gtest_and_gmock.h"
+
namespace perfetto {
namespace profiling {
namespace {
@@ -41,7 +39,7 @@
std::make_shared<FDMemory>(std::move(proc_mem)));
StackOverlayMemory memory(mem, 0u, fake_stack, 1);
uint8_t buf[1] = {};
- ASSERT_EQ(memory.Read(0u, buf, 1), 1);
+ ASSERT_EQ(memory.Read(0u, buf, 1), 1u);
ASSERT_EQ(buf[0], 120);
}
@@ -55,7 +53,7 @@
std::make_shared<FDMemory>(std::move(proc_mem)));
StackOverlayMemory memory(mem, 0u, fake_stack, 1);
uint8_t buf[1] = {1};
- ASSERT_EQ(memory.Read(reinterpret_cast<uint64_t>(&value), buf, 1), 1);
+ ASSERT_EQ(memory.Read(reinterpret_cast<uint64_t>(&value), buf, 1), 1u);
ASSERT_EQ(buf[0], value);
}
diff --git a/src/profiling/memory/wire_protocol_unittest.cc b/src/profiling/memory/wire_protocol_unittest.cc
index ed9cc74..a8d623e 100644
--- a/src/profiling/memory/wire_protocol_unittest.cc
+++ b/src/profiling/memory/wire_protocol_unittest.cc
@@ -15,15 +15,14 @@
*/
#include "src/profiling/memory/wire_protocol.h"
-#include "perfetto/base/logging.h"
-#include "perfetto/ext/base/scoped_file.h"
-#include "perfetto/ext/base/unix_socket.h"
#include <sys/socket.h>
#include <sys/types.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "perfetto/base/logging.h"
+#include "perfetto/ext/base/scoped_file.h"
+#include "perfetto/ext/base/unix_socket.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace profiling {
diff --git a/src/protozero/message_handle_unittest.cc b/src/protozero/message_handle_unittest.cc
index f6cbdb8..7f0ee08 100644
--- a/src/protozero/message_handle_unittest.cc
+++ b/src/protozero/message_handle_unittest.cc
@@ -16,8 +16,8 @@
#include "perfetto/protozero/message_handle.h"
-#include <gtest/gtest.h>
#include "perfetto/protozero/message.h"
+#include "test/gtest_and_gmock.h"
namespace protozero {
diff --git a/src/protozero/message_unittest.cc b/src/protozero/message_unittest.cc
index 8bffabc..d75dcd0 100644
--- a/src/protozero/message_unittest.cc
+++ b/src/protozero/message_unittest.cc
@@ -22,10 +22,10 @@
#include <utility>
#include <vector>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "src/base/test/utils.h"
#include "src/protozero/test/fake_scattered_buffer.h"
+#include "test/gtest_and_gmock.h"
namespace protozero {
diff --git a/src/protozero/proto_decoder_unittest.cc b/src/protozero/proto_decoder_unittest.cc
index 9bcdac4..06bf07a 100644
--- a/src/protozero/proto_decoder_unittest.cc
+++ b/src/protozero/proto_decoder_unittest.cc
@@ -16,12 +16,11 @@
#include "perfetto/protozero/proto_decoder.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
#include "perfetto/protozero/message.h"
#include "perfetto/protozero/proto_utils.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
+#include "test/gtest_and_gmock.h"
namespace protozero {
namespace {
diff --git a/src/protozero/proto_utils_unittest.cc b/src/protozero/proto_utils_unittest.cc
index bb1be9e..9d56d07 100644
--- a/src/protozero/proto_utils_unittest.cc
+++ b/src/protozero/proto_utils_unittest.cc
@@ -18,9 +18,9 @@
#include <limits>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace protozero {
namespace proto_utils {
diff --git a/src/protozero/scattered_stream_writer_unittest.cc b/src/protozero/scattered_stream_writer_unittest.cc
index dca3c0e..b3ec99c 100644
--- a/src/protozero/scattered_stream_writer_unittest.cc
+++ b/src/protozero/scattered_stream_writer_unittest.cc
@@ -20,9 +20,9 @@
#include <memory>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "src/protozero/test/fake_scattered_buffer.h"
+#include "test/gtest_and_gmock.h"
namespace protozero {
namespace {
diff --git a/src/protozero/test/fake_scattered_buffer.cc b/src/protozero/test/fake_scattered_buffer.cc
index 626ab28..7b65b29 100644
--- a/src/protozero/test/fake_scattered_buffer.cc
+++ b/src/protozero/test/fake_scattered_buffer.cc
@@ -19,7 +19,7 @@
#include <sstream>
#include <utility>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace protozero {
diff --git a/src/protozero/test/protozero_conformance_unittest.cc b/src/protozero/test/protozero_conformance_unittest.cc
index b92a875..cf5ab94 100644
--- a/src/protozero/test/protozero_conformance_unittest.cc
+++ b/src/protozero/test/protozero_conformance_unittest.cc
@@ -18,9 +18,9 @@
#include <memory>
#include <vector>
-#include <gtest/gtest.h>
#include "perfetto/protozero/message_handle.h"
#include "src/protozero/test/fake_scattered_buffer.h"
+#include "test/gtest_and_gmock.h"
// Autogenerated headers in out/*/gen/
#include "src/protozero/test/example_proto/library.pbzero.h"
diff --git a/src/trace_processor/args_table_unittest.cc b/src/trace_processor/args_table_unittest.cc
index de2350a..35ab452 100644
--- a/src/trace_processor/args_table_unittest.cc
+++ b/src/trace_processor/args_table_unittest.cc
@@ -18,9 +18,7 @@
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
@@ -86,7 +84,7 @@
ASSERT_EQ(sqlite3_column_type(*stmt_, 4), SQLITE_NULL);
}
if (real_value.has_value()) {
- ASSERT_EQ(sqlite3_column_double(*stmt_, 5), real_value.value());
+ ASSERT_DOUBLE_EQ(sqlite3_column_double(*stmt_, 5), real_value.value());
} else {
ASSERT_EQ(sqlite3_column_type(*stmt_, 5), SQLITE_NULL);
}
diff --git a/src/trace_processor/clock_tracker_unittest.cc b/src/trace_processor/clock_tracker_unittest.cc
index 350f836..2812e11 100644
--- a/src/trace_processor/clock_tracker_unittest.cc
+++ b/src/trace_processor/clock_tracker_unittest.cc
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "src/trace_processor/clock_tracker.h"
#include "perfetto/ext/base/optional.h"
-#include "src/trace_processor/clock_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/clock_snapshot.pbzero.h"
diff --git a/src/trace_processor/event_tracker_unittest.cc b/src/trace_processor/event_tracker_unittest.cc
index 1773cdb..53747a5 100644
--- a/src/trace_processor/event_tracker_unittest.cc
+++ b/src/trace_processor/event_tracker_unittest.cc
@@ -18,9 +18,7 @@
#include "src/trace_processor/args_tracker.h"
#include "src/trace_processor/process_tracker.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
@@ -124,15 +122,15 @@
ASSERT_EQ(context.storage->counter_values().size(), 4ul);
ASSERT_EQ(context.storage->counter_values().timestamps().at(0), timestamp);
- ASSERT_EQ(context.storage->counter_values().values().at(0), 1000);
+ ASSERT_DOUBLE_EQ(context.storage->counter_values().values().at(0), 1000);
ASSERT_EQ(context.storage->counter_values().timestamps().at(1),
timestamp + 1);
- ASSERT_EQ(context.storage->counter_values().values().at(1), 4000);
+ ASSERT_DOUBLE_EQ(context.storage->counter_values().values().at(1), 4000);
ASSERT_EQ(context.storage->counter_values().timestamps().at(2),
timestamp + 3);
- ASSERT_EQ(context.storage->counter_values().values().at(2), 5000);
+ ASSERT_DOUBLE_EQ(context.storage->counter_values().values().at(2), 5000);
}
} // namespace
diff --git a/src/trace_processor/export_json_unittest.cc b/src/trace_processor/export_json_unittest.cc
index 64d6949..ea04091 100644
--- a/src/trace_processor/export_json_unittest.cc
+++ b/src/trace_processor/export_json_unittest.cc
@@ -20,8 +20,7 @@
#include "src/trace_processor/args_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
#include <json/reader.h>
#include <json/value.h>
@@ -259,10 +258,11 @@
EXPECT_EQ(telemetry_metadata["storyTags"][0].asString(), kStoryTag1);
EXPECT_EQ(telemetry_metadata["storyTags"][1].asString(), kStoryTag2);
- EXPECT_EQ(telemetry_metadata["benchmarkStart"].asInt(),
- kBenchmarkStart / 1000.0);
+ EXPECT_DOUBLE_EQ(telemetry_metadata["benchmarkStart"].asInt(),
+ kBenchmarkStart / 1000.0);
- EXPECT_EQ(telemetry_metadata["traceStart"].asInt(), kStoryStart / 1000.0);
+ EXPECT_DOUBLE_EQ(telemetry_metadata["traceStart"].asInt(),
+ kStoryStart / 1000.0);
EXPECT_EQ(telemetry_metadata["hadFailures"].size(), 1u);
EXPECT_EQ(telemetry_metadata["hadFailures"][0].asBool(), kHadFailures);
@@ -418,8 +418,8 @@
EXPECT_EQ(event["cat"].asString(), kCategory);
EXPECT_EQ(event["name"].asString(), kName);
EXPECT_EQ(event["args"]["draw_duration_ms"].size(), 2u);
- EXPECT_EQ(event["args"]["draw_duration_ms"][0].asDouble(), kValues[0]);
- EXPECT_EQ(event["args"]["draw_duration_ms"][1].asDouble(), kValues[1]);
+ EXPECT_DOUBLE_EQ(event["args"]["draw_duration_ms"][0].asDouble(), kValues[0]);
+ EXPECT_DOUBLE_EQ(event["args"]["draw_duration_ms"][1].asDouble(), kValues[1]);
}
TEST(ExportJsonTest, StorageWithMultiplePointerArgs) {
diff --git a/src/trace_processor/filtered_row_index_unittest.cc b/src/trace_processor/filtered_row_index_unittest.cc
index 280b633..6810097 100644
--- a/src/trace_processor/filtered_row_index_unittest.cc
+++ b/src/trace_processor/filtered_row_index_unittest.cc
@@ -16,8 +16,7 @@
#include "src/trace_processor/filtered_row_index.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/forwarding_trace_parser_unittest.cc b/src/trace_processor/forwarding_trace_parser_unittest.cc
index df4c013..0d6877c 100644
--- a/src/trace_processor/forwarding_trace_parser_unittest.cc
+++ b/src/trace_processor/forwarding_trace_parser_unittest.cc
@@ -16,8 +16,7 @@
#include "src/trace_processor/forwarding_trace_parser.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/ftrace_utils_unittest.cc b/src/trace_processor/ftrace_utils_unittest.cc
index c54d8bd..dbfe0e4 100644
--- a/src/trace_processor/ftrace_utils_unittest.cc
+++ b/src/trace_processor/ftrace_utils_unittest.cc
@@ -16,8 +16,7 @@
#include "src/trace_processor/ftrace_utils.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/fuchsia_trace_utils_unittest.cc b/src/trace_processor/fuchsia_trace_utils_unittest.cc
index 68dd1b5..fbe06ee 100644
--- a/src/trace_processor/fuchsia_trace_utils_unittest.cc
+++ b/src/trace_processor/fuchsia_trace_utils_unittest.cc
@@ -16,7 +16,7 @@
#include "src/trace_processor/fuchsia_trace_utils.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/heap_profile_tracker_unittest.cc b/src/trace_processor/heap_profile_tracker_unittest.cc
index c627a9f..b0c816c 100644
--- a/src/trace_processor/heap_profile_tracker_unittest.cc
+++ b/src/trace_processor/heap_profile_tracker_unittest.cc
@@ -17,9 +17,7 @@
#include "src/trace_processor/heap_profile_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/json_trace_tokenizer_unittest.cc b/src/trace_processor/json_trace_tokenizer_unittest.cc
index 3a266ee..532d543 100644
--- a/src/trace_processor/json_trace_tokenizer_unittest.cc
+++ b/src/trace_processor/json_trace_tokenizer_unittest.cc
@@ -18,8 +18,7 @@
#include <json/value.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/json_trace_utils_unittest.cc b/src/trace_processor/json_trace_utils_unittest.cc
index 950e598..ef8b1f1 100644
--- a/src/trace_processor/json_trace_utils_unittest.cc
+++ b/src/trace_processor/json_trace_utils_unittest.cc
@@ -18,8 +18,7 @@
#include <json/value.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/metadata_table_unittest.cc b/src/trace_processor/metadata_table_unittest.cc
index 49cb7e9..4757cf0 100644
--- a/src/trace_processor/metadata_table_unittest.cc
+++ b/src/trace_processor/metadata_table_unittest.cc
@@ -18,9 +18,7 @@
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/metrics/metrics_unittest.cc b/src/trace_processor/metrics/metrics_unittest.cc
index 5c766a5..297e919 100644
--- a/src/trace_processor/metrics/metrics_unittest.cc
+++ b/src/trace_processor/metrics/metrics_unittest.cc
@@ -18,9 +18,8 @@
#include <vector>
-#include <gtest/gtest.h>
-
#include "perfetto/common/descriptor.pbzero.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
@@ -107,7 +106,7 @@
auto result_ser = builder.SerializeToProtoBuilderResult();
auto proto = DecodeSingleFieldProto<false>(result_ser);
const protozero::Field& db_field = proto.Get(1);
- ASSERT_EQ(db_field.as_double(), 1.2345);
+ ASSERT_DOUBLE_EQ(db_field.as_double(), 1.2345);
}
TEST_F(ProtoBuilderTest, AppendString) {
diff --git a/src/trace_processor/null_term_string_view_unittest.cc b/src/trace_processor/null_term_string_view_unittest.cc
index 7ea23d4..c8cc29e 100644
--- a/src/trace_processor/null_term_string_view_unittest.cc
+++ b/src/trace_processor/null_term_string_view_unittest.cc
@@ -16,8 +16,7 @@
#include "src/trace_processor/null_term_string_view.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/process_table_unittest.cc b/src/trace_processor/process_table_unittest.cc
index 700b206..6cb957d 100644
--- a/src/trace_processor/process_table_unittest.cc
+++ b/src/trace_processor/process_table_unittest.cc
@@ -20,8 +20,7 @@
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/trace_processor_context.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/process_tracker_unittest.cc b/src/trace_processor/process_tracker_unittest.cc
index 7d2fa9c..35a452f 100644
--- a/src/trace_processor/process_tracker_unittest.cc
+++ b/src/trace_processor/process_tracker_unittest.cc
@@ -18,9 +18,7 @@
#include "src/trace_processor/args_tracker.h"
#include "src/trace_processor/event_tracker.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/proto_trace_parser_unittest.cc b/src/trace_processor/proto_trace_parser_unittest.cc
index c01c09e..31e52f2 100644
--- a/src/trace_processor/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/proto_trace_parser_unittest.cc
@@ -16,8 +16,6 @@
#include "src/trace_processor/proto_trace_tokenizer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/string_view.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "src/trace_processor/args_tracker.h"
@@ -29,6 +27,7 @@
#include "src/trace_processor/systrace_parser.h"
#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/virtual_track_tracker.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/common/sys_stats_counters.pbzero.h"
#include "perfetto/trace/android/packages_list.pbzero.h"
@@ -68,6 +67,14 @@
using ::testing::Return;
using ::testing::UnorderedElementsAreArray;
+MATCHER_P(DoubleEq, exp, "Double matcher that satisfies -Wfloat-equal") {
+ // The IEEE standard says that any comparison operation involving
+ // a NAN must return false.
+ if (isnan(exp) || isnan(arg))
+ return false;
+ return fabs(arg - exp) < 1e-128;
+}
+
class MockEventTracker : public EventTracker {
public:
MockEventTracker(TraceProcessorContext* context) : EventTracker(context) {}
@@ -513,8 +520,9 @@
uint32_t value = 10;
meminfo->set_value(value);
- EXPECT_CALL(*event_, PushCounter(static_cast<int64_t>(ts), value * 1024, _, 0,
- RefType::kRefNoRef, false));
+ EXPECT_CALL(*event_,
+ PushCounter(static_cast<int64_t>(ts), DoubleEq(value * 1024.0), _,
+ 0, RefType::kRefNoRef, false));
Tokenize();
}
@@ -528,8 +536,8 @@
uint32_t value = 10;
meminfo->set_value(value);
- EXPECT_CALL(*event_, PushCounter(static_cast<int64_t>(ts), value, _, 0,
- RefType::kRefNoRef, false));
+ EXPECT_CALL(*event_, PushCounter(static_cast<int64_t>(ts), DoubleEq(value), _,
+ 0, RefType::kRefNoRef, false));
Tokenize();
}
@@ -543,8 +551,8 @@
cpu_freq->set_cpu_id(10);
cpu_freq->set_state(2000);
- EXPECT_CALL(*event_,
- PushCounter(1000, 2000, _, 10, RefType::kRefCpuId, false));
+ EXPECT_CALL(*event_, PushCounter(1000, DoubleEq(2000), _, 10,
+ RefType::kRefCpuId, false));
Tokenize();
}
diff --git a/src/trace_processor/query_constraints_unittest.cc b/src/trace_processor/query_constraints_unittest.cc
index a2f3678..2f50eab 100644
--- a/src/trace_processor/query_constraints_unittest.cc
+++ b/src/trace_processor/query_constraints_unittest.cc
@@ -15,9 +15,8 @@
*/
#include "src/trace_processor/query_constraints.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
+#include "test/gtest_and_gmock.h"
using testing::ElementsAreArray;
using testing::Matcher;
diff --git a/src/trace_processor/sched_slice_table_unittest.cc b/src/trace_processor/sched_slice_table_unittest.cc
index df9a12b..fd76128 100644
--- a/src/trace_processor/sched_slice_table_unittest.cc
+++ b/src/trace_processor/sched_slice_table_unittest.cc
@@ -21,9 +21,7 @@
#include "src/trace_processor/process_tracker.h"
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/trace_processor_context.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/slice_tracker_unittest.cc b/src/trace_processor/slice_tracker_unittest.cc
index afedfe6..203941e 100644
--- a/src/trace_processor/slice_tracker_unittest.cc
+++ b/src/trace_processor/slice_tracker_unittest.cc
@@ -20,9 +20,7 @@
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/span_join_operator_table_unittest.cc b/src/trace_processor/span_join_operator_table_unittest.cc
index 6734c6b..86d24f2 100644
--- a/src/trace_processor/span_join_operator_table_unittest.cc
+++ b/src/trace_processor/span_join_operator_table_unittest.cc
@@ -16,10 +16,9 @@
#include "src/trace_processor/span_join_operator_table.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/sqlite3_str_split_unittest.cc b/src/trace_processor/sqlite3_str_split_unittest.cc
index 71a16b0..46d69cd 100644
--- a/src/trace_processor/sqlite3_str_split_unittest.cc
+++ b/src/trace_processor/sqlite3_str_split_unittest.cc
@@ -17,11 +17,11 @@
#include "src/trace_processor/sqlite3_str_split.h"
#include <string>
+
#include "perfetto/base/logging.h"
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/sqlite.h"
-
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/string_pool_unittest.cc b/src/trace_processor/string_pool_unittest.cc
index 1fee073..87003e9 100644
--- a/src/trace_processor/string_pool_unittest.cc
+++ b/src/trace_processor/string_pool_unittest.cc
@@ -18,7 +18,7 @@
#include <random>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/syscall_tracker_unittest.cc b/src/trace_processor/syscall_tracker_unittest.cc
index a87c5fb..81c3017 100644
--- a/src/trace_processor/syscall_tracker_unittest.cc
+++ b/src/trace_processor/syscall_tracker_unittest.cc
@@ -17,9 +17,7 @@
#include "src/trace_processor/syscall_tracker.h"
#include "src/trace_processor/slice_tracker.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/systrace_parser_unittest.cc b/src/trace_processor/systrace_parser_unittest.cc
index 3f08832..9c6dc10 100644
--- a/src/trace_processor/systrace_parser_unittest.cc
+++ b/src/trace_processor/systrace_parser_unittest.cc
@@ -16,7 +16,7 @@
#include "src/trace_processor/systrace_parser.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/thread_table_unittest.cc b/src/trace_processor/thread_table_unittest.cc
index 117ec7c..632e153 100644
--- a/src/trace_processor/thread_table_unittest.cc
+++ b/src/trace_processor/thread_table_unittest.cc
@@ -22,9 +22,7 @@
#include "src/trace_processor/process_tracker.h"
#include "src/trace_processor/scoped_db.h"
#include "src/trace_processor/trace_processor_context.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/trace_database_integrationtest.cc b/src/trace_processor/trace_database_integrationtest.cc
index 9a60472..b7061ed 100644
--- a/src/trace_processor/trace_database_integrationtest.cc
+++ b/src/trace_processor/trace_database_integrationtest.cc
@@ -18,12 +18,12 @@
#include <random>
#include <string>
-#include <gtest/gtest.h>
#include "perfetto/base/logging.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/trace_processor/trace_processor.h"
#include "src/base/test/utils.h"
#include "src/trace_processor/json_trace_parser.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/trace_processor/trace_sorter_unittest.cc b/src/trace_processor/trace_sorter_unittest.cc
index c3dcd09..116902e 100644
--- a/src/trace_processor/trace_sorter_unittest.cc
+++ b/src/trace_processor/trace_sorter_unittest.cc
@@ -19,12 +19,10 @@
#include <random>
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/trace_processor/basic_types.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_sorter.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace trace_processor {
diff --git a/src/traced/probes/android_log/android_log_data_source_unittest.cc b/src/traced/probes/android_log/android_log_data_source_unittest.cc
index cb7bb71..b1e7d41 100644
--- a/src/traced/probes/android_log/android_log_data_source_unittest.cc
+++ b/src/traced/probes/android_log/android_log_data_source_unittest.cc
@@ -16,21 +16,18 @@
#include "src/traced/probes/android_log/android_log_data_source.h"
+#include "perfetto/common/android_log_constants.pbzero.h"
+#include "perfetto/config/android/android_log_config.pbzero.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "perfetto/tracing/core/data_source_config.h"
#include "src/base/test/test_task_runner.h"
#include "src/tracing/core/trace_writer_for_testing.h"
+#include "test/gtest_and_gmock.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "perfetto/common/android_log_constants.pbzero.h"
-#include "perfetto/config/android/android_log_config.pbzero.h"
-
-using ::testing::Invoke;
-using ::testing::Return;
using ::perfetto::protos::pbzero::AndroidLogConfig;
using ::perfetto::protos::pbzero::AndroidLogId;
+using ::testing::Invoke;
+using ::testing::Return;
namespace perfetto {
namespace {
@@ -183,18 +180,18 @@
auto* fmt = data_source_->GetEventFormat(42);
ASSERT_NE(fmt, nullptr);
ASSERT_EQ(fmt->name, "answer");
- ASSERT_EQ(fmt->fields.size(), 1);
+ ASSERT_EQ(fmt->fields.size(), 1u);
ASSERT_EQ(fmt->fields[0], "to life the universe etc");
fmt = data_source_->GetEventFormat(314);
ASSERT_NE(fmt, nullptr);
ASSERT_EQ(fmt->name, "pi");
- ASSERT_EQ(fmt->fields.size(), 0);
+ ASSERT_EQ(fmt->fields.size(), 0u);
fmt = data_source_->GetEventFormat(1005);
ASSERT_NE(fmt, nullptr);
ASSERT_EQ(fmt->name, "tag_def");
- ASSERT_EQ(fmt->fields.size(), 3);
+ ASSERT_EQ(fmt->fields.size(), 3u);
ASSERT_EQ(fmt->fields[0], "tag");
ASSERT_EQ(fmt->fields[1], "name");
ASSERT_EQ(fmt->fields[2], "format");
@@ -202,7 +199,7 @@
fmt = data_source_->GetEventFormat(1937006964);
ASSERT_NE(fmt, nullptr);
ASSERT_EQ(fmt->name, "stats_log");
- ASSERT_EQ(fmt->fields.size(), 2);
+ ASSERT_EQ(fmt->fields.size(), 2u);
ASSERT_EQ(fmt->fields[0], "atom_id");
ASSERT_EQ(fmt->fields[1], "data");
}
@@ -229,7 +226,7 @@
EXPECT_EQ(decoded.Get(0).tid(), 8991);
EXPECT_EQ(decoded.Get(0).uid(), 1000);
EXPECT_EQ(decoded.Get(0).prio(), protos::AndroidLogPriority::PRIO_INFO);
- EXPECT_EQ(decoded.Get(0).timestamp(), 1546125239679172326LL);
+ EXPECT_EQ(decoded.Get(0).timestamp(), 1546125239679172326ULL);
EXPECT_EQ(decoded.Get(0).tag(), "ActivityManager");
EXPECT_EQ(
decoded.Get(0).message(),
@@ -240,7 +237,7 @@
EXPECT_EQ(decoded.Get(1).tid(), 7570);
EXPECT_EQ(decoded.Get(1).uid(), 1000);
EXPECT_EQ(decoded.Get(1).prio(), protos::AndroidLogPriority::PRIO_WARN);
- EXPECT_EQ(decoded.Get(1).timestamp(), 1546125239683537170LL);
+ EXPECT_EQ(decoded.Get(1).timestamp(), 1546125239683537170ULL);
EXPECT_EQ(decoded.Get(1).tag(), "libprocessgroup");
EXPECT_EQ(decoded.Get(1).message(),
"kill(-11660, 9) failed: No such process");
@@ -250,7 +247,7 @@
EXPECT_EQ(decoded.Get(2).tid(), 7415);
EXPECT_EQ(decoded.Get(2).uid(), 0);
EXPECT_EQ(decoded.Get(2).prio(), protos::AndroidLogPriority::PRIO_INFO);
- EXPECT_EQ(decoded.Get(2).timestamp(), 1546125239719458684LL);
+ EXPECT_EQ(decoded.Get(2).timestamp(), 1546125239719458684ULL);
EXPECT_EQ(decoded.Get(2).tag(), "Zygote");
EXPECT_EQ(decoded.Get(2).message(), "Process 11660 exited due to signal (9)");
}
@@ -327,7 +324,7 @@
EXPECT_EQ(decoded.Get(0).pid(), 29981);
EXPECT_EQ(decoded.Get(0).tid(), 30962);
EXPECT_EQ(decoded.Get(0).uid(), 1000);
- EXPECT_EQ(decoded.Get(0).timestamp(), 1546165328914257883LL);
+ EXPECT_EQ(decoded.Get(0).timestamp(), 1546165328914257883ULL);
EXPECT_EQ(decoded.Get(0).tag(), "am_kill");
ASSERT_EQ(decoded.Get(0).args_size(), 5);
EXPECT_EQ(decoded.Get(0).args(0).name(), "User");
@@ -345,7 +342,7 @@
EXPECT_EQ(decoded.Get(1).pid(), 29981);
EXPECT_EQ(decoded.Get(1).tid(), 30962);
EXPECT_EQ(decoded.Get(1).uid(), 1000);
- EXPECT_EQ(decoded.Get(1).timestamp(), 1546165328946231844LL);
+ EXPECT_EQ(decoded.Get(1).timestamp(), 1546165328946231844ULL);
EXPECT_EQ(decoded.Get(1).tag(), "am_uid_stopped");
ASSERT_EQ(decoded.Get(1).args_size(), 1);
EXPECT_EQ(decoded.Get(1).args(0).name(), "UID");
@@ -355,7 +352,7 @@
EXPECT_EQ(decoded.Get(2).pid(), 29981);
EXPECT_EQ(decoded.Get(2).tid(), 29998);
EXPECT_EQ(decoded.Get(2).uid(), 1000);
- EXPECT_EQ(decoded.Get(2).timestamp(), 1546165328960813044LL);
+ EXPECT_EQ(decoded.Get(2).timestamp(), 1546165328960813044ULL);
EXPECT_EQ(decoded.Get(2).tag(), "am_pss");
ASSERT_EQ(decoded.Get(2).args_size(), 10);
EXPECT_EQ(decoded.Get(2).args(0).name(), "Pid");
@@ -406,7 +403,7 @@
EXPECT_EQ(event_packet.android_log().events_size(), 1);
const auto& decoded = event_packet.android_log().events();
- EXPECT_EQ(decoded.Get(0).timestamp(), 1546165328946231844LL);
+ EXPECT_EQ(decoded.Get(0).timestamp(), 1546165328946231844ULL);
EXPECT_EQ(decoded.Get(0).tag(), "am_uid_stopped");
}
diff --git a/src/traced/probes/filesystem/file_scanner_unittest.cc b/src/traced/probes/filesystem/file_scanner_unittest.cc
index ef21e0e..a035c56 100644
--- a/src/traced/probes/filesystem/file_scanner_unittest.cc
+++ b/src/traced/probes/filesystem/file_scanner_unittest.cc
@@ -16,15 +16,13 @@
#include "src/traced/probes/filesystem/file_scanner.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include <sys/stat.h>
#include <memory>
#include <string>
#include "perfetto/base/logging.h"
#include "src/base/test/test_task_runner.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/filesystem/fs_mount_unittest.cc b/src/traced/probes/filesystem/fs_mount_unittest.cc
index d2462d3..6a516db 100644
--- a/src/traced/probes/filesystem/fs_mount_unittest.cc
+++ b/src/traced/probes/filesystem/fs_mount_unittest.cc
@@ -21,13 +21,12 @@
#include <stdlib.h>
#include <sys/stat.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
@@ -54,7 +53,7 @@
base::TempFile tmp_file = base::TempFile::Create();
ASSERT_EQ(base::WriteAll(tmp_file.fd(), kMounts, sizeof(kMounts)),
- sizeof(kMounts));
+ static_cast<ssize_t>(sizeof(kMounts)));
std::multimap<BlockDeviceID, std::string> mounts =
ParseMounts(tmp_file.path().c_str());
struct stat dev_stat = {}, root_stat = {};
diff --git a/src/traced/probes/filesystem/inode_file_data_source_unittest.cc b/src/traced/probes/filesystem/inode_file_data_source_unittest.cc
index 2354063..66cec63 100644
--- a/src/traced/probes/filesystem/inode_file_data_source_unittest.cc
+++ b/src/traced/probes/filesystem/inode_file_data_source_unittest.cc
@@ -20,13 +20,11 @@
#include "src/base/test/test_task_runner.h"
#include "src/traced/probes/filesystem/lru_inode_cache.h"
#include "src/tracing/core/null_trace_writer.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/config/inode_file/inode_file_config.pbzero.h"
#include "perfetto/trace/filesystem/inode_file_map.pbzero.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
namespace perfetto {
namespace {
diff --git a/src/traced/probes/filesystem/lru_inode_cache_unittest.cc b/src/traced/probes/filesystem/lru_inode_cache_unittest.cc
index 8fb3429..a71a584 100644
--- a/src/traced/probes/filesystem/lru_inode_cache_unittest.cc
+++ b/src/traced/probes/filesystem/lru_inode_cache_unittest.cc
@@ -16,12 +16,11 @@
#include "src/traced/probes/filesystem/lru_inode_cache.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include <string>
#include <tuple>
+#include "test/gtest_and_gmock.h"
+
namespace perfetto {
namespace {
diff --git a/src/traced/probes/filesystem/prefix_finder_unittest.cc b/src/traced/probes/filesystem/prefix_finder_unittest.cc
index 0301810..a40ab6f 100644
--- a/src/traced/probes/filesystem/prefix_finder_unittest.cc
+++ b/src/traced/probes/filesystem/prefix_finder_unittest.cc
@@ -21,12 +21,11 @@
#include <stdlib.h>
#include <sys/stat.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/filesystem/range_tree_unittest.cc b/src/traced/probes/filesystem/range_tree_unittest.cc
index b600b8e..ce26a36 100644
--- a/src/traced/probes/filesystem/range_tree_unittest.cc
+++ b/src/traced/probes/filesystem/range_tree_unittest.cc
@@ -22,12 +22,11 @@
#include <stdlib.h>
#include <sys/stat.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/scoped_file.h"
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/ftrace/cpu_reader_unittest.cc b/src/traced/probes/ftrace/cpu_reader_unittest.cc
index 4b4ef35..4518d47 100644
--- a/src/traced/probes/ftrace/cpu_reader_unittest.cc
+++ b/src/traced/probes/ftrace/cpu_reader_unittest.cc
@@ -18,16 +18,14 @@
#include <sys/stat.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include "src/traced/probes/ftrace/event_info.h"
-#include "src/traced/probes/ftrace/proto_translation_table.h"
-
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/utils.h"
#include "perfetto/protozero/proto_utils.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "perfetto/protozero/scattered_stream_writer.h"
+#include "src/traced/probes/ftrace/event_info.h"
+#include "src/traced/probes/ftrace/proto_translation_table.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/ftrace/ftrace_event.pb.h"
#include "perfetto/trace/ftrace/ftrace_event.pbzero.h"
@@ -38,19 +36,19 @@
#include "src/traced/probes/ftrace/test/test_messages.pb.h"
#include "src/traced/probes/ftrace/test/test_messages.pbzero.h"
+using protozero::proto_utils::ProtoSchemaType;
+using testing::_;
+using testing::AnyNumber;
+using testing::Contains;
using testing::Each;
using testing::ElementsAre;
using testing::ElementsAreArray;
using testing::EndsWith;
using testing::Eq;
-using testing::Pair;
-using testing::StartsWith;
-using testing::Contains;
-using testing::_;
-using testing::Return;
-using testing::AnyNumber;
using testing::NiceMock;
-using protozero::proto_utils::ProtoSchemaType;
+using testing::Pair;
+using testing::Return;
+using testing::StartsWith;
namespace perfetto {
@@ -318,7 +316,7 @@
CpuReader::PageHeader parsed = ret.value();
ASSERT_EQ(parsed.timestamp, 0x0001A26777DBF33Eull); // first 8 bytes
- ASSERT_EQ(parsed.size, 0x0ff0); // 4080
+ ASSERT_EQ(parsed.size, 0x0ff0u); // 4080
ASSERT_TRUE(parsed.lost_events);
// pointer advanced past the header (8+4 bytes)
@@ -333,7 +331,7 @@
CpuReader::PageHeader parsed = ret.value();
ASSERT_EQ(parsed.timestamp, 0x0001A26777DBF33Eull); // first 8 bytes
- ASSERT_EQ(parsed.size, 0x0ff0); // 4080
+ ASSERT_EQ(parsed.size, 0x0ff0u); // 4080
ASSERT_TRUE(parsed.lost_events);
// pointer advanced past the header (8+8 bytes)
diff --git a/src/traced/probes/ftrace/cpu_stats_parser_unittest.cc b/src/traced/probes/ftrace/cpu_stats_parser_unittest.cc
index fdcd173..f10b335 100644
--- a/src/traced/probes/ftrace/cpu_stats_parser_unittest.cc
+++ b/src/traced/probes/ftrace/cpu_stats_parser_unittest.cc
@@ -1,10 +1,8 @@
#include "src/traced/probes/ftrace/cpu_stats_parser.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "src/traced/probes/ftrace/ftrace_controller.h"
#include "src/traced/probes/ftrace/ftrace_stats.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
@@ -23,14 +21,14 @@
FtraceCpuStats stats{};
EXPECT_TRUE(DumpCpuStats(text, &stats));
- EXPECT_EQ(stats.entries, 1);
- EXPECT_EQ(stats.overrun, 2);
- EXPECT_EQ(stats.commit_overrun, 3);
- EXPECT_EQ(stats.bytes_read, 4);
- EXPECT_EQ(stats.oldest_event_ts, 5123.000);
- EXPECT_EQ(stats.now_ts, 6123.123);
- EXPECT_EQ(stats.dropped_events, 7);
- EXPECT_EQ(stats.read_events, 8);
+ EXPECT_EQ(stats.entries, 1u);
+ EXPECT_EQ(stats.overrun, 2u);
+ EXPECT_EQ(stats.commit_overrun, 3u);
+ EXPECT_EQ(stats.bytes_read, 4u);
+ EXPECT_DOUBLE_EQ(stats.oldest_event_ts, 5123.0);
+ EXPECT_DOUBLE_EQ(stats.now_ts, 6123.123);
+ EXPECT_EQ(stats.dropped_events, 7u);
+ EXPECT_EQ(stats.read_events, 8u);
}
} // namespace
diff --git a/src/traced/probes/ftrace/event_info_unittest.cc b/src/traced/probes/ftrace/event_info_unittest.cc
index d43e9f1..6c3f9d8 100644
--- a/src/traced/probes/ftrace/event_info_unittest.cc
+++ b/src/traced/probes/ftrace/event_info_unittest.cc
@@ -15,9 +15,9 @@
*/
#include "src/traced/probes/ftrace/event_info.h"
-#include "perfetto/protozero/proto_utils.h"
-#include <gtest/gtest.h>
+#include "perfetto/protozero/proto_utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/ftrace/format_parser_unittest.cc b/src/traced/probes/ftrace/format_parser_unittest.cc
index f6566ad..3e92f67 100644
--- a/src/traced/probes/ftrace/format_parser_unittest.cc
+++ b/src/traced/probes/ftrace/format_parser_unittest.cc
@@ -15,8 +15,7 @@
*/
#include "src/traced/probes/ftrace/format_parser.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc b/src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc
index eecdc5a..2269929 100644
--- a/src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc
+++ b/src/traced/probes/ftrace/ftrace_config_muxer_unittest.cc
@@ -18,11 +18,10 @@
#include <memory>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "src/traced/probes/ftrace/atrace_wrapper.h"
#include "src/traced/probes/ftrace/ftrace_procfs.h"
#include "src/traced/probes/ftrace/proto_translation_table.h"
+#include "test/gtest_and_gmock.h"
using testing::_;
using testing::AnyNumber;
diff --git a/src/traced/probes/ftrace/ftrace_config_unittest.cc b/src/traced/probes/ftrace/ftrace_config_unittest.cc
index 7a27cd3..0c22fee 100644
--- a/src/traced/probes/ftrace/ftrace_config_unittest.cc
+++ b/src/traced/probes/ftrace/ftrace_config_unittest.cc
@@ -16,8 +16,7 @@
#include "src/traced/probes/ftrace/ftrace_config_utils.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
using testing::Contains;
diff --git a/src/traced/probes/ftrace/ftrace_controller_unittest.cc b/src/traced/probes/ftrace/ftrace_controller_unittest.cc
index 2e0dc8b..154dc36 100644
--- a/src/traced/probes/ftrace/ftrace_controller_unittest.cc
+++ b/src/traced/probes/ftrace/ftrace_controller_unittest.cc
@@ -20,8 +20,6 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "src/traced/probes/ftrace/cpu_reader.h"
#include "src/traced/probes/ftrace/ftrace_config_muxer.h"
#include "src/traced/probes/ftrace/ftrace_config_utils.h"
@@ -29,6 +27,7 @@
#include "src/traced/probes/ftrace/ftrace_procfs.h"
#include "src/traced/probes/ftrace/proto_translation_table.h"
#include "src/tracing/core/trace_writer_for_testing.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/ftrace/ftrace_event_bundle.pbzero.h"
#include "perfetto/trace/ftrace/ftrace_stats.pbzero.h"
@@ -537,9 +536,9 @@
protos::TracePacket result_packet = writer->GetOnlyTracePacket();
auto result = result_packet.ftrace_stats().cpu_stats(0);
- EXPECT_EQ(result.cpu(), 0);
- EXPECT_EQ(result.entries(), 1);
- EXPECT_EQ(result.overrun(), 2);
+ EXPECT_EQ(result.cpu(), 0u);
+ EXPECT_EQ(result.entries(), 1u);
+ EXPECT_EQ(result.overrun(), 2u);
}
} // namespace perfetto
diff --git a/src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc b/src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc
index 022190a..b8bf269 100644
--- a/src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc
+++ b/src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc
@@ -19,11 +19,10 @@
#include <sstream>
#include <string>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/file_utils.h"
#include "src/traced/probes/ftrace/ftrace_controller.h"
#include "src/traced/probes/ftrace/ftrace_procfs.h"
+#include "test/gtest_and_gmock.h"
using testing::HasSubstr;
using testing::Not;
diff --git a/src/traced/probes/ftrace/ftrace_procfs_unittest.cc b/src/traced/probes/ftrace/ftrace_procfs_unittest.cc
index 4a10854..a8051de 100644
--- a/src/traced/probes/ftrace/ftrace_procfs_unittest.cc
+++ b/src/traced/probes/ftrace/ftrace_procfs_unittest.cc
@@ -16,8 +16,7 @@
#include "src/traced/probes/ftrace/ftrace_procfs.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
using testing::AnyNumber;
using testing::IsEmpty;
diff --git a/src/traced/probes/ftrace/proto_translation_table_unittest.cc b/src/traced/probes/ftrace/proto_translation_table_unittest.cc
index 249e0ac..904304c 100644
--- a/src/traced/probes/ftrace/proto_translation_table_unittest.cc
+++ b/src/traced/probes/ftrace/proto_translation_table_unittest.cc
@@ -16,13 +16,12 @@
#include "src/traced/probes/ftrace/proto_translation_table.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/trace/ftrace/ftrace_event.pbzero.h"
#include "perfetto/trace/ftrace/generic.pbzero.h"
#include "src/base/test/gtest_test_suite.h"
#include "src/traced/probes/ftrace/event_info.h"
#include "src/traced/probes/ftrace/ftrace_procfs.h"
+#include "test/gtest_and_gmock.h"
using testing::_;
using testing::Values;
@@ -401,9 +400,9 @@
EXPECT_EQ(table->EventToFtraceId(group_and_name), 42ul);
// Check getters
- EXPECT_EQ(table->GetEventById(42)->proto_field_id,
+ EXPECT_EQ(static_cast<int>(table->GetEventById(42)->proto_field_id),
protos::pbzero::FtraceEvent::kGenericFieldNumber);
- EXPECT_EQ(table->GetEvent(group_and_name)->proto_field_id,
+ EXPECT_EQ(static_cast<int>(table->GetEvent(group_and_name)->proto_field_id),
protos::pbzero::FtraceEvent::kGenericFieldNumber);
EXPECT_EQ(table->GetEventsByGroup("group")->front()->name,
group_and_name.name());
@@ -413,7 +412,7 @@
// Check string field
const auto& str_field = fields[0];
EXPECT_STREQ(str_field.ftrace_name, "field_a");
- EXPECT_EQ(str_field.proto_field_id,
+ EXPECT_EQ(static_cast<int>(str_field.proto_field_id),
protos::pbzero::GenericFtraceEvent::Field::kStrValueFieldNumber);
EXPECT_EQ(str_field.proto_field_type, ProtoSchemaType::kString);
EXPECT_EQ(str_field.ftrace_type, kFtraceFixedCString);
@@ -423,7 +422,7 @@
// Check bool field
const auto& bool_field = fields[1];
EXPECT_STREQ(bool_field.ftrace_name, "field_b");
- EXPECT_EQ(bool_field.proto_field_id,
+ EXPECT_EQ(static_cast<int>(bool_field.proto_field_id),
protos::pbzero::GenericFtraceEvent::Field::kUintValueFieldNumber);
EXPECT_EQ(bool_field.proto_field_type, ProtoSchemaType::kUint64);
EXPECT_EQ(bool_field.ftrace_type, kFtraceBool);
@@ -433,7 +432,7 @@
// Check int field
const auto& int_field = fields[2];
EXPECT_STREQ(int_field.ftrace_name, "field_c");
- EXPECT_EQ(int_field.proto_field_id,
+ EXPECT_EQ(static_cast<int>(int_field.proto_field_id),
protos::pbzero::GenericFtraceEvent::Field::kIntValueFieldNumber);
EXPECT_EQ(int_field.proto_field_type, ProtoSchemaType::kInt64);
EXPECT_EQ(int_field.ftrace_type, kFtraceInt32);
@@ -443,7 +442,7 @@
// Check uint field
const auto& uint_field = fields[3];
EXPECT_STREQ(uint_field.ftrace_name, "field_d");
- EXPECT_EQ(uint_field.proto_field_id,
+ EXPECT_EQ(static_cast<int>(uint_field.proto_field_id),
protos::pbzero::GenericFtraceEvent::Field::kUintValueFieldNumber);
EXPECT_EQ(uint_field.proto_field_type, ProtoSchemaType::kUint64);
EXPECT_EQ(uint_field.ftrace_type, kFtraceUint32);
diff --git a/src/traced/probes/packages_list/packages_list_data_source_unittest.cc b/src/traced/probes/packages_list/packages_list_data_source_unittest.cc
index 9433ea1..ced67ac 100644
--- a/src/traced/probes/packages_list/packages_list_data_source_unittest.cc
+++ b/src/traced/probes/packages_list/packages_list_data_source_unittest.cc
@@ -16,7 +16,6 @@
#include "src/traced/probes/packages_list/packages_list_data_source.h"
-#include <gtest/gtest.h>
#include <stdio.h>
#include <set>
@@ -26,6 +25,7 @@
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "perfetto/trace/android/packages_list.pb.h"
#include "perfetto/trace/android/packages_list.pbzero.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/traced/probes/ps/process_stats_data_source_unittest.cc b/src/traced/probes/ps/process_stats_data_source_unittest.cc
index 18e8cf2..5e8ec96 100644
--- a/src/traced/probes/ps/process_stats_data_source_unittest.cc
+++ b/src/traced/probes/ps/process_stats_data_source_unittest.cc
@@ -18,24 +18,23 @@
#include <dirent.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "perfetto/tracing/core/data_source_config.h"
#include "src/base/test/test_task_runner.h"
#include "src/tracing/core/trace_writer_for_testing.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/config/process_stats/process_stats_config.pbzero.h"
#include "perfetto/trace/trace_packet.pbzero.h"
+using ::perfetto::protos::pbzero::ProcessStatsConfig;
using ::testing::_;
using ::testing::ElementsAreArray;
using ::testing::Invoke;
using ::testing::Mock;
using ::testing::Return;
using ::testing::Truly;
-using ::perfetto::protos::pbzero::ProcessStatsConfig;
namespace perfetto {
namespace {
@@ -80,7 +79,7 @@
data_source->OnPids({42});
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- ASSERT_EQ(trace.size(), 1);
+ ASSERT_EQ(trace.size(), 1u);
auto ps_tree = trace[0].process_tree();
ASSERT_EQ(ps_tree.processes_size(), 1);
auto first_process = ps_tree.processes(0);
@@ -131,7 +130,7 @@
// check written contents
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- EXPECT_EQ(trace.size(), 3);
+ EXPECT_EQ(trace.size(), 3u);
// first packet - two unique processes, four threads
auto ps_tree = trace[0].process_tree();
@@ -168,7 +167,7 @@
{
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- ASSERT_EQ(trace.size(), 1);
+ ASSERT_EQ(trace.size(), 1u);
auto packet = trace[0];
// First packet in the trace has no previous state, so the clear marker is
// emitted.
@@ -191,7 +190,7 @@
{
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- ASSERT_EQ(trace.size(), 1);
+ ASSERT_EQ(trace.size(), 1u);
}
// Invalidate incremental state, and look up the same pid again, which should
@@ -208,7 +207,7 @@
{
// Second packet with new proc information.
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- ASSERT_EQ(trace.size(), 2);
+ ASSERT_EQ(trace.size(), 2u);
auto packet = trace[1];
ASSERT_TRUE(packet.incremental_state_cleared());
@@ -264,7 +263,7 @@
// check written contents
std::vector<protos::TracePacket> trace = writer_raw_->GetAllTracePackets();
- EXPECT_EQ(trace.size(), 3);
+ EXPECT_EQ(trace.size(), 3u);
// first packet - two unique processes
auto ps_tree = trace[0].process_tree();
@@ -350,9 +349,12 @@
iter = 0;
for (const auto& proc_counters : processes) {
int32_t pid = proc_counters.pid();
- ASSERT_EQ(proc_counters.vm_size_kb(), pid * 100 + iter * 10 + 1);
- ASSERT_EQ(proc_counters.vm_rss_kb(), pid * 100 + iter * 10 + 2);
- ASSERT_EQ(proc_counters.oom_score_adj(), pid * 100 + iter * 10 + 3);
+ ASSERT_EQ(static_cast<int>(proc_counters.vm_size_kb()),
+ pid * 100 + iter * 10 + 1);
+ ASSERT_EQ(static_cast<int>(proc_counters.vm_rss_kb()),
+ pid * 100 + iter * 10 + 2);
+ ASSERT_EQ(static_cast<int>(proc_counters.oom_score_adj()),
+ pid * 100 + iter * 10 + 3);
if (pid == kPids[base::ArraySize(kPids) - 1])
iter++;
}
@@ -418,12 +420,12 @@
// a) emissions happen at 0ms, 105ms, 210ms, 315ms
// b) clear events happen at 220ms, 440ms...
// Therefore, we should see the emissions at 0ms and 315ms.
- ASSERT_EQ(processes.size(), 2);
+ ASSERT_EQ(processes.size(), 2u);
for (const auto& proc_counters : processes) {
ASSERT_EQ(proc_counters.pid(), kPid);
- ASSERT_EQ(proc_counters.vm_size_kb(), kPid * 100 + 1);
- ASSERT_EQ(proc_counters.vm_rss_kb(), kPid * 100 + 2);
- ASSERT_EQ(proc_counters.oom_score_adj(), kPid * 100);
+ ASSERT_EQ(static_cast<int>(proc_counters.vm_size_kb()), kPid * 100 + 1);
+ ASSERT_EQ(static_cast<int>(proc_counters.vm_rss_kb()), kPid * 100 + 2);
+ ASSERT_EQ(static_cast<int>(proc_counters.oom_score_adj()), kPid * 100);
}
// Cleanup |fake_proc|. TempDir checks that the directory is empty.
diff --git a/src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc b/src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc
index 333e426..72196b9 100644
--- a/src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc
+++ b/src/traced/probes/sys_stats/sys_stats_data_source_unittest.cc
@@ -16,13 +16,12 @@
#include <unistd.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/protozero/scattered_heap_buffer.h"
#include "src/base/test/test_task_runner.h"
#include "src/traced/probes/sys_stats/sys_stats_data_source.h"
#include "src/tracing/core/trace_writer_for_testing.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/common/sys_stats_counters.pbzero.h"
#include "perfetto/config/data_source_config.pbzero.h"
@@ -353,22 +352,22 @@
EXPECT_EQ(sys_stats.cpu_stat(7).system_mode_ns(), 139874 * 10000000ull);
EXPECT_EQ(sys_stats.cpu_stat(7).softirq_ns(), 13407 * 10000000ull);
- EXPECT_EQ(sys_stats.num_forks(), 243320);
+ EXPECT_EQ(sys_stats.num_forks(), 243320u);
- EXPECT_EQ(sys_stats.num_irq_total(), 238128517);
+ EXPECT_EQ(sys_stats.num_irq_total(), 238128517u);
ASSERT_EQ(sys_stats.num_irq_size(), 102);
- EXPECT_EQ(sys_stats.num_irq(0).count(), 63500984);
+ EXPECT_EQ(sys_stats.num_irq(0).count(), 63500984u);
EXPECT_EQ(sys_stats.num_irq(0).irq(), 3);
- EXPECT_EQ(sys_stats.num_irq(1).count(), 6253792);
+ EXPECT_EQ(sys_stats.num_irq(1).count(), 6253792u);
EXPECT_EQ(sys_stats.num_irq(1).irq(), 5);
- EXPECT_EQ(sys_stats.num_irq(101).count(), 680);
+ EXPECT_EQ(sys_stats.num_irq(101).count(), 680u);
- EXPECT_EQ(sys_stats.num_softirq_total(), 84611084);
+ EXPECT_EQ(sys_stats.num_softirq_total(), 84611084u);
ASSERT_EQ(sys_stats.num_softirq_size(), 10);
- EXPECT_EQ(sys_stats.num_softirq(0).count(), 10220177);
- EXPECT_EQ(sys_stats.num_softirq(9).count(), 16443195);
+ EXPECT_EQ(sys_stats.num_softirq(0).count(), 10220177u);
+ EXPECT_EQ(sys_stats.num_softirq(9).count(), 16443195u);
- EXPECT_EQ(sys_stats.num_softirq_total(), 84611084);
+ EXPECT_EQ(sys_stats.num_softirq_total(), 84611084u);
}
TEST_F(SysStatsDataSourceTest, StatForksOnly) {
@@ -388,10 +387,10 @@
EXPECT_EQ(sys_stats.meminfo_size(), 0);
EXPECT_EQ(sys_stats.vmstat_size(), 0);
ASSERT_EQ(sys_stats.cpu_stat_size(), 0);
- EXPECT_EQ(sys_stats.num_forks(), 243320);
- EXPECT_EQ(sys_stats.num_irq_total(), 0);
+ EXPECT_EQ(sys_stats.num_forks(), 243320u);
+ EXPECT_EQ(sys_stats.num_irq_total(), 0u);
ASSERT_EQ(sys_stats.num_irq_size(), 0);
- EXPECT_EQ(sys_stats.num_softirq_total(), 0);
+ EXPECT_EQ(sys_stats.num_softirq_total(), 0u);
ASSERT_EQ(sys_stats.num_softirq_size(), 0);
}
diff --git a/src/traced/service/builtin_producer_unittest.cc b/src/traced/service/builtin_producer_unittest.cc
index 3193090..80b17fe 100644
--- a/src/traced/service/builtin_producer_unittest.cc
+++ b/src/traced/service/builtin_producer_unittest.cc
@@ -16,11 +16,9 @@
#include "src/traced/service/builtin_producer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/tracing/core/data_source_config.h"
#include "src/base/test/test_task_runner.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/api_integrationtest.cc b/src/tracing/api_integrationtest.cc
index a8027b9..4ac129c 100644
--- a/src/tracing/api_integrationtest.cc
+++ b/src/tracing/api_integrationtest.cc
@@ -23,13 +23,11 @@
#include <mutex>
#include <vector>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
#include "perfetto/trace/test_event.pbzero.h"
#include "perfetto/trace/trace.pb.h"
#include "perfetto/trace/trace_packet.pbzero.h"
#include "perfetto/tracing.h"
+#include "test/gtest_and_gmock.h"
// Deliberately not pulling any non-public perfetto header to spot accidental
// header public -> non-public dependency while building this file.
@@ -164,7 +162,7 @@
template <typename DataSourceType>
TestDataSourceHandle* RegisterDataSource(std::string name) {
- EXPECT_EQ(data_sources_.count(name), 0);
+ EXPECT_EQ(data_sources_.count(name), 0u);
TestDataSourceHandle* handle = &data_sources_[name];
perfetto::DataSourceDescriptor dsd;
dsd.set_name(name);
diff --git a/src/tracing/core/id_allocator_unittest.cc b/src/tracing/core/id_allocator_unittest.cc
index 1eac8a2..4d557bb 100644
--- a/src/tracing/core/id_allocator_unittest.cc
+++ b/src/tracing/core/id_allocator_unittest.cc
@@ -16,7 +16,7 @@
#include "src/tracing/core/id_allocator.h"
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/null_trace_writer_unittest.cc b/src/tracing/core/null_trace_writer_unittest.cc
index b63c54d..987e333 100644
--- a/src/tracing/core/null_trace_writer_unittest.cc
+++ b/src/tracing/core/null_trace_writer_unittest.cc
@@ -16,10 +16,9 @@
#include "src/tracing/core/null_trace_writer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
#include "perfetto/ext/tracing/core/trace_writer.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/test_event.pbzero.h"
#include "perfetto/trace/trace_packet.pbzero.h"
diff --git a/src/tracing/core/packet_stream_validator_unittest.cc b/src/tracing/core/packet_stream_validator_unittest.cc
index d1ff038..0385a39 100644
--- a/src/tracing/core/packet_stream_validator_unittest.cc
+++ b/src/tracing/core/packet_stream_validator_unittest.cc
@@ -18,9 +18,8 @@
#include <string>
-#include <gtest/gtest.h>
-
#include "perfetto/trace/trace_packet.pb.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/patch_list_unittest.cc b/src/tracing/core/patch_list_unittest.cc
index 7112740..dee9a1a 100644
--- a/src/tracing/core/patch_list_unittest.cc
+++ b/src/tracing/core/patch_list_unittest.cc
@@ -18,8 +18,7 @@
#include <ostream>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
using testing::ElementsAre;
diff --git a/src/tracing/core/shared_memory_abi_unittest.cc b/src/tracing/core/shared_memory_abi_unittest.cc
index baa09f9..aed8893 100644
--- a/src/tracing/core/shared_memory_abi_unittest.cc
+++ b/src/tracing/core/shared_memory_abi_unittest.cc
@@ -16,10 +16,10 @@
#include "perfetto/ext/tracing/core/shared_memory_abi.h"
-#include <gtest/gtest.h>
#include "perfetto/ext/tracing/core/basic_types.h"
#include "src/base/test/gtest_test_suite.h"
#include "src/tracing/test/aligned_buffer_test.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/shared_memory_arbiter_impl_unittest.cc b/src/tracing/core/shared_memory_arbiter_impl_unittest.cc
index 5905ef8..9ead96f 100644
--- a/src/tracing/core/shared_memory_arbiter_impl_unittest.cc
+++ b/src/tracing/core/shared_memory_arbiter_impl_unittest.cc
@@ -16,8 +16,6 @@
#include "src/tracing/core/shared_memory_arbiter_impl.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
#include "perfetto/ext/tracing/core/basic_types.h"
#include "perfetto/ext/tracing/core/commit_data_request.h"
@@ -27,6 +25,7 @@
#include "src/base/test/test_task_runner.h"
#include "src/tracing/core/patch_list.h"
#include "src/tracing/test/aligned_buffer_test.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/sliced_protobuf_input_stream_unittest.cc b/src/tracing/core/sliced_protobuf_input_stream_unittest.cc
index c7ae94c..59f52f2 100644
--- a/src/tracing/core/sliced_protobuf_input_stream_unittest.cc
+++ b/src/tracing/core/sliced_protobuf_input_stream_unittest.cc
@@ -16,8 +16,8 @@
#include "src/tracing/core/sliced_protobuf_input_stream.h"
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/startup_trace_writer_unittest.cc b/src/tracing/core/startup_trace_writer_unittest.cc
index 8383548..7f4c51e 100644
--- a/src/tracing/core/startup_trace_writer_unittest.cc
+++ b/src/tracing/core/startup_trace_writer_unittest.cc
@@ -16,7 +16,6 @@
#include "perfetto/ext/tracing/core/startup_trace_writer.h"
-#include <gtest/gtest.h>
#include "perfetto/ext/tracing/core/startup_trace_writer_registry.h"
#include "perfetto/ext/tracing/core/trace_packet.h"
#include "perfetto/ext/tracing/core/tracing_service.h"
@@ -28,6 +27,7 @@
#include "src/tracing/core/trace_buffer.h"
#include "src/tracing/test/aligned_buffer_test.h"
#include "src/tracing/test/fake_producer_endpoint.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/test_event.pbzero.h"
#include "perfetto/trace/trace_packet.pb.h"
diff --git a/src/tracing/core/trace_buffer_unittest.cc b/src/tracing/core/trace_buffer_unittest.cc
index ca3b9db..f7012a5 100644
--- a/src/tracing/core/trace_buffer_unittest.cc
+++ b/src/tracing/core/trace_buffer_unittest.cc
@@ -28,9 +28,7 @@
#include "perfetto/protozero/proto_utils.h"
#include "src/tracing/core/trace_buffer.h"
#include "src/tracing/test/fake_packet.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "test/gtest_and_gmock.h"
namespace perfetto {
diff --git a/src/tracing/core/trace_packet_unittest.cc b/src/tracing/core/trace_packet_unittest.cc
index ad95e7c..1be0741 100644
--- a/src/tracing/core/trace_packet_unittest.cc
+++ b/src/tracing/core/trace_packet_unittest.cc
@@ -18,11 +18,10 @@
#include <string>
-#include <gtest/gtest.h>
-
#include "perfetto/trace/trace.pb.h"
#include "perfetto/trace/trace_packet.pb.h"
#include "perfetto/trace/trusted_packet.pb.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/core/trace_writer_impl_unittest.cc b/src/tracing/core/trace_writer_impl_unittest.cc
index 32ae83c..bc9882a 100644
--- a/src/tracing/core/trace_writer_impl_unittest.cc
+++ b/src/tracing/core/trace_writer_impl_unittest.cc
@@ -16,7 +16,6 @@
#include "src/tracing/core/trace_writer_impl.h"
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
#include "perfetto/ext/tracing/core/commit_data_request.h"
#include "perfetto/ext/tracing/core/trace_writer.h"
@@ -26,6 +25,7 @@
#include "src/tracing/core/shared_memory_arbiter_impl.h"
#include "src/tracing/test/aligned_buffer_test.h"
#include "src/tracing/test/fake_producer_endpoint.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/test_event.pbzero.h"
#include "perfetto/trace/trace_packet.pbzero.h"
diff --git a/src/tracing/core/tracing_service_impl_unittest.cc b/src/tracing/core/tracing_service_impl_unittest.cc
index 7a26c2a..beed0fc 100644
--- a/src/tracing/core/tracing_service_impl_unittest.cc
+++ b/src/tracing/core/tracing_service_impl_unittest.cc
@@ -18,8 +18,6 @@
#include <string.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/base/utils.h"
@@ -36,6 +34,7 @@
#include "src/tracing/test/mock_consumer.h"
#include "src/tracing/test/mock_producer.h"
#include "src/tracing/test/test_shared_memory.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/test_event.pbzero.h"
#include "perfetto/trace/trace.pb.h"
diff --git a/src/tracing/ipc/posix_shared_memory_unittest.cc b/src/tracing/ipc/posix_shared_memory_unittest.cc
index 2bb9aee..1156556 100644
--- a/src/tracing/ipc/posix_shared_memory_unittest.cc
+++ b/src/tracing/ipc/posix_shared_memory_unittest.cc
@@ -23,7 +23,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <gtest/gtest.h>
#include "perfetto/base/build_config.h"
#include "perfetto/ext/base/file_utils.h"
#include "perfetto/ext/base/scoped_file.h"
@@ -31,6 +30,7 @@
#include "perfetto/ext/base/utils.h"
#include "src/base/test/test_task_runner.h"
#include "src/base/test/vm_test_utils.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
namespace {
diff --git a/src/tracing/test/aligned_buffer_test.h b/src/tracing/test/aligned_buffer_test.h
index f9d9932..18ee4ba 100644
--- a/src/tracing/test/aligned_buffer_test.h
+++ b/src/tracing/test/aligned_buffer_test.h
@@ -21,9 +21,9 @@
#include <memory>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/utils.h"
#include "src/tracing/test/test_shared_memory.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
diff --git a/src/tracing/test/mock_consumer.h b/src/tracing/test/mock_consumer.h
index 6365edd..214a1b9 100644
--- a/src/tracing/test/mock_consumer.h
+++ b/src/tracing/test/mock_consumer.h
@@ -19,11 +19,11 @@
#include <memory>
-#include <gmock/gmock.h>
#include "perfetto/ext/tracing/core/consumer.h"
#include "perfetto/ext/tracing/core/trace_packet.h"
#include "perfetto/ext/tracing/core/tracing_service.h"
#include "perfetto/tracing/core/tracing_service_state.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/trace/trace_packet.pb.h"
diff --git a/src/tracing/test/mock_producer.h b/src/tracing/test/mock_producer.h
index 405a647..7b23f2c 100644
--- a/src/tracing/test/mock_producer.h
+++ b/src/tracing/test/mock_producer.h
@@ -21,10 +21,10 @@
#include <memory>
#include <string>
-#include <gmock/gmock.h>
#include "perfetto/ext/tracing/core/producer.h"
#include "perfetto/ext/tracing/core/trace_writer.h"
#include "perfetto/ext/tracing/core/tracing_service.h"
+#include "test/gtest_and_gmock.h"
namespace perfetto {
diff --git a/src/tracing/test/tracing_integration_test.cc b/src/tracing/test/tracing_integration_test.cc
index fc817de..61e66af 100644
--- a/src/tracing/test/tracing_integration_test.cc
+++ b/src/tracing/test/tracing_integration_test.cc
@@ -17,8 +17,6 @@
#include <inttypes.h>
#include <unistd.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
#include "perfetto/ext/base/temp_file.h"
#include "perfetto/ext/tracing/core/consumer.h"
#include "perfetto/ext/tracing/core/producer.h"
@@ -34,6 +32,7 @@
#include "src/base/test/test_task_runner.h"
#include "src/ipc/test/test_socket.h"
#include "src/tracing/core/tracing_service_impl.h"
+#include "test/gtest_and_gmock.h"
#include "perfetto/config/trace_config.pb.h"
#include "perfetto/trace/test_event.pbzero.h"
