From 0e56a83fd054dca43fb38e8af6205244dea56967 Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Thu, 5 Oct 2023 13:53:11 +0100 Subject: RESTRICT AUTOMERGE: Disable TriggerCloneSnapshot test on U The proto field id for clone snapshot has been changed in U QPR1 to deal with bugs in the feature (fixed only in QPR). The test, however, is part of CTS which needs to work on all U releases. This CL disables the test on the android14-tests-dev branch and keeps it in main. Bug: 302438506 Bug: 296227911 Change-Id: Iee267f52cf3b9e5da678592fc8f01521e8f7d7b0 --- test/cmdline_integrationtest.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/cmdline_integrationtest.cc b/test/cmdline_integrationtest.cc index f8c7a43e6..53cc9e6e6 100644 --- a/test/cmdline_integrationtest.cc +++ b/test/cmdline_integrationtest.cc @@ -852,7 +852,10 @@ TEST_F(PerfettoCmdlineTest, AndroidOnly(CmdTriggerWithUploadFlag)) { Eq("trigger_name"))))); } -TEST_F(PerfettoCmdlineTest, TriggerCloneSnapshot) { +// This test has been disabled in Android U for CTS tests, because of the +// (deliberate) breaking change made in aosp/2723034. The proto field ID is also +// used by the CTS test, which, by design, needs to work on all U releases. +TEST_F(PerfettoCmdlineTest, DISABLED_TriggerCloneSnapshot) { constexpr size_t kMessageCount = 2; constexpr size_t kMessageSize = 2; protos::gen::TraceConfig trace_config; -- cgit v1.2.3