diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2021-08-12 12:03:33 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-08-12 22:44:22 +0000 |
| commit | eab4d8950c25d46f9adca6232305bb1877a80bd4 (patch) | |
| tree | 5b7c6a440f3cd0889923523e294b8b809cea0122 | |
| parent | f69a7701253a1c934595a31c581465a1acb0af80 (diff) | |
| parent | 3a9c0ef08c3aa0f1edc6dbf5502e84025c092609 (diff) | |
| download | perfetto-eab4d8950c25d46f9adca6232305bb1877a80bd4.tar.gz | |
Merge ab/7633965
Bug: 169893837
Merged-In: I3fe41e4a10d06b02610729bc22c926e923399366
Change-Id: I34c03b9e1ddce83e0fed719d5b8785707caa0a70
| -rw-r--r-- | test/end_to_end_integrationtest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/end_to_end_integrationtest.cc b/test/end_to_end_integrationtest.cc index 63336412a..7b19368eb 100644 --- a/test/end_to_end_integrationtest.cc +++ b/test/end_to_end_integrationtest.cc @@ -1079,7 +1079,13 @@ TEST_F(PerfettoTest, SaveForBugreport_WriteIntoFile) { // 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); |