diff options
| author | Primiano Tucci <primiano@google.com> | 2021-06-25 12:04:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-25 12:04:31 +0000 |
| commit | 712e9cfa065fae37b5c4e7a5ad283da61108bf7b (patch) | |
| tree | 5b7c6a440f3cd0889923523e294b8b809cea0122 | |
| parent | 868b1b728ce1955610f55106f0361741abda404a (diff) | |
| parent | 3a9c0ef08c3aa0f1edc6dbf5502e84025c092609 (diff) | |
| download | perfetto-712e9cfa065fae37b5c4e7a5ad283da61108bf7b.tar.gz | |
Disable SaveForBugreport_Triggers on android builds am: 3a9c0ef08c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/perfetto/+/15105932
Change-Id: I4718e905431300d0c254242fdb8bedff04d04987
| -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); |