commit 2808debf6f80e08a6c4179fac1d2db3ac50b37f2
author Mike Frysinger <vapier@chromium.org> Thu Jan 28 01:22:13 2016 -0500
committer chrome-bot <chrome-bot@chromium.org> Thu Jan 28 14:16:17 2016 -0800
tree a1e67792701e4b276f06a3a383d9f5fd6e5a1c7e
parent 195212905ed99c59a04632d577328e4cf8ecf291

cros_generate_breakpad_symbols: pass dump_syms the new -v flag

The dump_syms tool was updated to be less verbose by default, but we rely
on parsing its error message to handle missing symbols.  Pass the -v flag
down so we get the full output.

BUG=chromium:579384
TEST=unittests pass
TEST=generating symbols for lakitu doesn't fail
CQ-DEPEND=CL:323010

Change-Id: I8a540056633ad148ccc60db2bf55401562dc00c3
Reviewed-on: https://chromium-review.googlesource.com/324241
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Rahul Chaudhry <rahulchaudhry@chromium.org>

scripts/cros_generate_breakpad_symbols_unittest.py

diff --git a/scripts/cros_generate_breakpad_symbols_unittest.py b/scripts/cros_generate_breakpad_symbols_unittest.py
index 9290feb..5d5c350 100644
--- a/scripts/cros_generate_breakpad_symbols_unittest.py
+++ b/scripts/cros_generate_breakpad_symbols_unittest.py
@@ -246,7 +246,8 @@
         self.elf_file, self.debug_file, self.breakpad_dir)
     self.assertEqual(ret, self.sym_file)
     self.assertEqual(self.rc_mock.call_count, 1)
-    self.assertCommandArgs(0, ['dump_syms', self.elf_file, self.debug_dir])
+    self.assertCommandArgs(0, ['dump_syms', '-v', self.elf_file,
+                               self.debug_dir])
     self.assertExists(self.sym_file)
 
   def testNormalNoCfi(self):
@@ -258,7 +259,7 @@
         strip_cfi=True, num_errors=num_errors)
     self.assertEqual(ret, self.sym_file)
     self.assertEqual(num_errors.value, 0)
-    self.assertCommandArgs(0, ['dump_syms', '-c', self.elf_file])
+    self.assertCommandArgs(0, ['dump_syms', '-v', '-c', self.elf_file])
     self.assertEqual(self.rc_mock.call_count, 1)
     self.assertExists(self.sym_file)
 
@@ -267,7 +268,7 @@
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, breakpad_dir=self.breakpad_dir)
     self.assertEqual(ret, self.sym_file)
-    self.assertCommandArgs(0, ['dump_syms', self.elf_file])
+    self.assertCommandArgs(0, ['dump_syms', '-v', self.elf_file])
     self.assertEqual(self.rc_mock.call_count, 1)
     self.assertExists(self.sym_file)
 
@@ -278,36 +279,38 @@
       ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
           self.elf_file, breakpad_dir=self.breakpad_dir)
     self.assertEqual(ret, self.sym_file)
-    self.assertCommandArgs(0, ['sudo', '--', 'dump_syms', self.elf_file])
+    self.assertCommandArgs(0, ['sudo', '--', 'dump_syms', '-v', self.elf_file])
 
   def testLargeDebugFail(self):
     """Running w/large .debug failed, but retry worked"""
-    self.rc_mock.AddCmdResult(['dump_syms', self.elf_file, self.debug_dir],
-                              returncode=1)
+    self.rc_mock.AddCmdResult(['dump_syms', '-v', self.elf_file,
+                               self.debug_dir], returncode=1)
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, self.debug_file, self.breakpad_dir)
     self.assertEqual(ret, self.sym_file)
     self.assertEqual(self.rc_mock.call_count, 2)
-    self.assertCommandArgs(0, ['dump_syms', self.elf_file, self.debug_dir])
+    self.assertCommandArgs(0, ['dump_syms', '-v', self.elf_file,
+                               self.debug_dir])
     self.assertCommandArgs(
-        1, ['dump_syms', '-c', '-r', self.elf_file, self.debug_dir])
+        1, ['dump_syms', '-v', '-c', '-r', self.elf_file, self.debug_dir])
     self.assertExists(self.sym_file)
 
   def testDebugFail(self):
     """Running w/.debug always failed, but works w/out"""
-    self.rc_mock.AddCmdResult(['dump_syms', self.elf_file, self.debug_dir],
-                              returncode=1)
-    self.rc_mock.AddCmdResult(['dump_syms', '-c', '-r', self.elf_file,
+    self.rc_mock.AddCmdResult(['dump_syms', '-v', self.elf_file,
+                               self.debug_dir], returncode=1)
+    self.rc_mock.AddCmdResult(['dump_syms', '-v', '-c', '-r', self.elf_file,
                                self.debug_dir],
                               returncode=1)
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, self.debug_file, self.breakpad_dir)
     self.assertEqual(ret, self.sym_file)
     self.assertEqual(self.rc_mock.call_count, 3)
-    self.assertCommandArgs(0, ['dump_syms', self.elf_file, self.debug_dir])
+    self.assertCommandArgs(0, ['dump_syms', '-v', self.elf_file,
+                               self.debug_dir])
     self.assertCommandArgs(
-        1, ['dump_syms', '-c', '-r', self.elf_file, self.debug_dir])
-    self.assertCommandArgs(2, ['dump_syms', self.elf_file])
+        1, ['dump_syms', '-v', '-c', '-r', self.elf_file, self.debug_dir])
+    self.assertCommandArgs(2, ['dump_syms', '-v', self.elf_file])
     self.assertExists(self.sym_file)
 
   def testCompleteFail(self):