Moved ScatteredStreamDelegateForTesting to protozero from ftrace_reader
This removes a recent dependency on ftrace_reader::test_support from tracing::test_support;
this is needed by Chrome which builds the latter but can't build the former.
Bug: 76169489
Change-Id: I18677388eaac900797ee10321b3f3380e05384fb
diff --git a/Android.bp b/Android.bp
index 2406d00..1f25dec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -285,7 +285,6 @@
"src/ftrace_reader/ftrace_procfs_integrationtest.cc",
"src/ftrace_reader/proto_translation_table.cc",
"src/ftrace_reader/test/cpu_reader_support.cc",
- "src/ftrace_reader/test/scattered_stream_delegate_for_testing.cc",
"src/ipc/buffered_frame_deserializer.cc",
"src/ipc/client_impl.cc",
"src/ipc/deferred.cc",
@@ -298,6 +297,7 @@
"src/protozero/message.cc",
"src/protozero/message_handle.cc",
"src/protozero/proto_utils.cc",
+ "src/protozero/scattered_stream_delegate_for_testing.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
"src/traced/probes/filesystem/file_scanner.cc",
@@ -3607,7 +3607,6 @@
"src/ftrace_reader/proto_translation_table.cc",
"src/ftrace_reader/proto_translation_table_unittest.cc",
"src/ftrace_reader/test/cpu_reader_support.cc",
- "src/ftrace_reader/test/scattered_stream_delegate_for_testing.cc",
"src/ipc/buffered_frame_deserializer.cc",
"src/ipc/buffered_frame_deserializer_unittest.cc",
"src/ipc/client_impl.cc",
@@ -3632,6 +3631,7 @@
"src/protozero/message_unittest.cc",
"src/protozero/proto_utils.cc",
"src/protozero/proto_utils_unittest.cc",
+ "src/protozero/scattered_stream_delegate_for_testing.cc",
"src/protozero/scattered_stream_null_delegate.cc",
"src/protozero/scattered_stream_writer.cc",
"src/protozero/scattered_stream_writer_unittest.cc",
diff --git a/src/ftrace_reader/BUILD.gn b/src/ftrace_reader/BUILD.gn
index 46de5df..80823b4 100644
--- a/src/ftrace_reader/BUILD.gn
+++ b/src/ftrace_reader/BUILD.gn
@@ -30,11 +30,13 @@
"../../gn:default_deps",
"../protozero",
]
+ public_deps = [
+ "../protozero:test_support",
+ ]
+
sources = [
"test/cpu_reader_support.cc",
"test/cpu_reader_support.h",
- "test/scattered_stream_delegate_for_testing.cc",
- "test/scattered_stream_delegate_for_testing.h",
]
}
diff --git a/src/ftrace_reader/cpu_reader_unittest.cc b/src/ftrace_reader/cpu_reader_unittest.cc
index f99b2d0..8be5e74 100644
--- a/src/ftrace_reader/cpu_reader_unittest.cc
+++ b/src/ftrace_reader/cpu_reader_unittest.cc
@@ -26,7 +26,7 @@
#include "perfetto/base/build_config.h"
#include "perfetto/base/utils.h"
#include "perfetto/protozero/scattered_stream_writer.h"
-#include "src/ftrace_reader/test/scattered_stream_delegate_for_testing.h"
+#include "src/protozero/scattered_stream_delegate_for_testing.h"
#include "perfetto/trace/ftrace/ftrace_event.pb.h"
#include "perfetto/trace/ftrace/ftrace_event.pbzero.h"
diff --git a/src/ftrace_reader/end_to_end_integrationtest.cc b/src/ftrace_reader/end_to_end_integrationtest.cc
index 44f3fa3..31311f8 100644
--- a/src/ftrace_reader/end_to_end_integrationtest.cc
+++ b/src/ftrace_reader/end_to_end_integrationtest.cc
@@ -27,7 +27,7 @@
#include "perfetto/ftrace_reader/ftrace_controller.h"
#include "perfetto/protozero/scattered_stream_writer.h"
#include "src/ftrace_reader/ftrace_procfs.h"
-#include "src/ftrace_reader/test/scattered_stream_delegate_for_testing.h"
+#include "src/protozero/scattered_stream_delegate_for_testing.h"
#include "perfetto/trace/ftrace/ftrace_event_bundle.pb.h"
#include "perfetto/trace/ftrace/ftrace_event_bundle.pbzero.h"
diff --git a/src/protozero/BUILD.gn b/src/protozero/BUILD.gn
index c7f3d95..1f10d00 100644
--- a/src/protozero/BUILD.gn
+++ b/src/protozero/BUILD.gn
@@ -35,6 +35,20 @@
]
}
+source_set("test_support") {
+ testonly = true
+ deps = [
+ "../../gn:default_deps",
+ ]
+ public_deps = [
+ ":protozero",
+ ]
+ sources = [
+ "scattered_stream_delegate_for_testing.cc",
+ "scattered_stream_delegate_for_testing.h",
+ ]
+}
+
source_set("unittests") {
testonly = true
deps = [
diff --git a/src/ftrace_reader/test/scattered_stream_delegate_for_testing.cc b/src/protozero/scattered_stream_delegate_for_testing.cc
similarity index 95%
rename from src/ftrace_reader/test/scattered_stream_delegate_for_testing.cc
rename to src/protozero/scattered_stream_delegate_for_testing.cc
index 305f561..0409a06 100644
--- a/src/ftrace_reader/test/scattered_stream_delegate_for_testing.cc
+++ b/src/protozero/scattered_stream_delegate_for_testing.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/ftrace_reader/test/scattered_stream_delegate_for_testing.h"
+#include "src/protozero/scattered_stream_delegate_for_testing.h"
namespace perfetto {
diff --git a/src/ftrace_reader/test/scattered_stream_delegate_for_testing.h b/src/protozero/scattered_stream_delegate_for_testing.h
similarity index 87%
rename from src/ftrace_reader/test/scattered_stream_delegate_for_testing.h
rename to src/protozero/scattered_stream_delegate_for_testing.h
index a743577..93b6874 100644
--- a/src/ftrace_reader/test/scattered_stream_delegate_for_testing.h
+++ b/src/protozero/scattered_stream_delegate_for_testing.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_FTRACE_READER_TEST_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
-#define SRC_FTRACE_READER_TEST_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#ifndef SRC_PROTOZERO_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#define SRC_PROTOZERO_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
#include <memory>
#include <vector>
@@ -54,4 +54,4 @@
} // namespace perfetto
-#endif // SRC_FTRACE_READER_TEST_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
+#endif // SRC_PROTOZERO_SCATTERED_STREAM_DELEGATE_FOR_TESTING_H_
diff --git a/src/tracing/BUILD.gn b/src/tracing/BUILD.gn
index 3c181cc..41b0130 100644
--- a/src/tracing/BUILD.gn
+++ b/src/tracing/BUILD.gn
@@ -128,7 +128,7 @@
"../../protos/perfetto/trace:zero",
"../base",
"../base:test_support",
- "../ftrace_reader:test_support",
+ "../protozero:test_support",
]
sources = [
"core/id_allocator_unittest.cc",
diff --git a/src/tracing/core/trace_writer_for_testing.h b/src/tracing/core/trace_writer_for_testing.h
index 6937095..2025963 100644
--- a/src/tracing/core/trace_writer_for_testing.h
+++ b/src/tracing/core/trace_writer_for_testing.h
@@ -19,7 +19,7 @@
#include "perfetto/protozero/message_handle.h"
#include "perfetto/trace/trace_packet.pb.h"
#include "perfetto/tracing/core/trace_writer.h"
-#include "src/ftrace_reader/test/scattered_stream_delegate_for_testing.h"
+#include "src/protozero/scattered_stream_delegate_for_testing.h"
namespace perfetto {