Merge "simpleperf: fix a bug setting symfs dir."

am: 2da01f61fd

Change-Id: I3a0fe2cf1f65ef2f33ffa7153e37e9842647796f

2 files changed, 8 insertions, 6 deletions

diff --git a/simpleperf/cmd_report.cpp b/simpleperf/cmd_report.cpp
index 1a4cb4c6..e6f5dabb 100644
--- a/simpleperf/cmd_report.cpp
+++ b/simpleperf/cmd_report.cpp
@@ -508,7 +508,6 @@ bool ReportCommand::Run(const std::vector<std::string>& args) {
 bool ReportCommand::ParseOptions(const std::vector<std::string>& args) {
   bool demangle = true;
   bool show_ip_for_unknown_symbol = true;
-  std::string symfs_dir;
   std::string vmlinux;
   bool print_sample_count = false;
   std::vector<std::string> sort_keys = {"comm", "pid", "tid", "dso", "symbol"};
@@ -613,8 +612,9 @@ bool ReportCommand::ParseOptions(const std::vector<std::string>& args) {
       if (!NextArgumentOrError(args, &i)) {
         return false;
       }
-      symfs_dir = args[i];
-
+      if (!Dso::SetSymFsDir(args[i])) {
+        return false;
+      }
     } else if (args[i] == "--vmlinux") {
       if (!NextArgumentOrError(args, &i)) {
         return false;
@@ -627,9 +627,6 @@ bool ReportCommand::ParseOptions(const std::vector<std::string>& args) {
   }
 
   Dso::SetDemangle(demangle);
-  if (!Dso::SetSymFsDir(symfs_dir)) {
-    return false;
-  }
   if (!vmlinux.empty()) {
     Dso::SetVmlinux(vmlinux);
   }
diff --git a/simpleperf/cmd_report_test.cpp b/simpleperf/cmd_report_test.cpp
index 03a67bd5..a7670300 100644
--- a/simpleperf/cmd_report_test.cpp
+++ b/simpleperf/cmd_report_test.cpp
@@ -351,6 +351,11 @@ TEST_F(ReportCommandTest, report_dumped_symbols_with_symfs_dir) {
   ASSERT_NE(content.find("main"), std::string::npos);
 }
 
+TEST_F(ReportCommandTest, report_without_symfs_dir) {
+  TemporaryFile tmpfile;
+  ASSERT_TRUE(ReportCmd()->Run({"-i", GetTestData(PERF_DATA), "-o", tmpfile.path}));
+}
+
 TEST_F(ReportCommandTest, report_sort_vaddr_in_file) {
   Report(PERF_DATA, {"--sort", "vaddr_in_file"});
   ASSERT_TRUE(success);