diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-24 02:09:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-24 02:09:35 +0000 |
| commit | 151780a42801198d6c02dc6b734fccd7cd23dfab (patch) | |
| tree | 3b8468f22db0dea398f9bb88115572c2213ae6ed | |
| parent | 36cd9f63dc5b0e4c9763214f4418408d2cfbeedc (diff) | |
| parent | 6a4274abcb2a298ba4d72d27c2ebba5a1873b2d7 (diff) | |
| download | perfetto-android14-platform-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23779980'] into udc-release.android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: I14209fa74abd4363e145eb98924795395b18febc
| -rw-r--r-- | test/ftrace_integrationtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ftrace_integrationtest.cc b/test/ftrace_integrationtest.cc index ae1b1046e..7fb8ea088 100644 --- a/test/ftrace_integrationtest.cc +++ b/test/ftrace_integrationtest.cc @@ -305,7 +305,7 @@ TEST_F(PerfettoFtraceIntegrationTest, ReportFtraceFailuresInStats) { ds_config->set_name("linux.ftrace"); protos::gen::FtraceConfig ftrace_config; - ftrace_config.add_ftrace_events("sched/sched_process_fork"); // Good. + ftrace_config.add_ftrace_events("sched/sched_switch"); // Good. ftrace_config.add_ftrace_events("sched/does_not_exist"); // Bad. ftrace_config.add_ftrace_events("foobar/i_just_made_this_up"); // Bad. ftrace_config.add_atrace_categories("madeup_atrace_cat"); // Bad. |