commit 3be91fb2b9adbeed0d70b8cc05670a890a98c162
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 26 03:04:28 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 26 03:04:28 2021 +0000
tree 5b7c6a440f3cd0889923523e294b8b809cea0122
parent 9dc41e0fefa344672a0071c41b146105b2852b16
parent 3a9c0ef08c3aa0f1edc6dbf5502e84025c092609

Snap for 7495277 from 3a9c0ef08c3aa0f1edc6dbf5502e84025c092609 to sc-release

Change-Id: If37d5204decae56e10a83516cb113cc376670cc9

test/end_to_end_integrationtest.cc

diff --git a/test/end_to_end_integrationtest.cc b/test/end_to_end_integrationtest.cc
index 6333641..7b19368 100644
--- a/test/end_to_end_integrationtest.cc
+++ b/test/end_to_end_integrationtest.cc
@@ -1079,7 +1079,13 @@
 // Tests that SaveTraceForBugreport() works also if the trace has triggers
 // defined and those triggers have not been hit. This is a regression test for
 // b/188008375 .
-TEST_F(PerfettoTest, SaveForBugreport_Triggers) {
+#if PERFETTO_BUILDFLAG(PERFETTO_ANDROID_BUILD)
+// Disabled due to b/191940560
+#define MAYBE_SaveForBugreport_Triggers DISABLED_SaveForBugreport_Triggers
+#else
+#define MAYBE_SaveForBugreport_Triggers SaveForBugreport_Triggers
+#endif
+TEST_F(PerfettoTest, MAYBE_SaveForBugreport_Triggers) {
   base::TestTaskRunner task_runner;
 
   TestHelper helper(&task_runner);