commit 1918c135635a174b3e79d9b3594a80b045529b14
author Primiano Tucci <primiano@google.com> Wed Mar 28 08:46:33 2018 +0100
committer Primiano Tucci <primiano@google.com> Wed Mar 28 08:46:33 2018 +0100
tree c12abb84c202a3d38f46b3d6ad4de0b3abb41438
parent fc9a8c95c81a874376514618400d5455bd243b39

Fix atrace unittest

Follow up to aosp/649522
Clicked submit too soon on that and it failed unittests. Fix
is trivial

Bug: 73625407
Test: perfetto_unittests --gtest_filter=FtraceConfigMuxerTest.Atrace
Change-Id: I2efec0c2a8ec137f7566a4c3c97a427f2f21b2d1

src/ftrace_reader/ftrace_config_muxer_unittest.cc

diff --git a/src/ftrace_reader/ftrace_config_muxer_unittest.cc b/src/ftrace_reader/ftrace_config_muxer_unittest.cc
index e3be7aa..1833fbd 100644
--- a/src/ftrace_reader/ftrace_config_muxer_unittest.cc
+++ b/src/ftrace_reader/ftrace_config_muxer_unittest.cc
@@ -212,7 +212,8 @@
   EXPECT_CALL(ftrace, ReadOneCharFromFile("/root/tracing_on"))
       .WillOnce(Return('0'));
   EXPECT_CALL(atrace,
-              RunAtrace(ElementsAreArray({"atrace", "--async_start", "sched"})))
+              RunAtrace(ElementsAreArray(
+                  {"atrace", "--async_start", "--only_userspace", "sched"})))
       .WillOnce(Return(true));
 
   FtraceConfigId id = model.RequestConfig(config);
@@ -223,7 +224,8 @@
   EXPECT_THAT(actual_config->ftrace_events(), Contains("sched_switch"));
   EXPECT_THAT(actual_config->ftrace_events(), Contains("print"));
 
-  EXPECT_CALL(atrace, RunAtrace(ElementsAreArray({"atrace", "--async_stop"})))
+  EXPECT_CALL(atrace, RunAtrace(ElementsAreArray(
+                          {"atrace", "--async_stop", "--only_userspace"})))
       .WillOnce(Return(true));
   ASSERT_TRUE(model.RemoveConfig(id));
 }