commit c9de3ace60117d2516dc6b1fbd6ed9f9aadf6e00
author Don Garrett <dgarrett@google.com> Thu Oct 01 15:40:10 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Oct 02 14:36:08 2015 -0700
tree 8687a2ed9d2f6e6206c6249dab84fcb095f35460
parent 36a13ac2cf7f0f956885bcb85ddc80db71f4d152

cros_generate_breakpad_symbols: Change GenerateBreakpadSymbol return.

Make GenerateBreakpadSymbol return the symbol file it's writing
out. This has no effect outside of unittests, but is needed for Ryu
symbol processing in another repository.

BUG=b/21954100
TEST=Unittests + manual testing with ryu scripts.

Change-Id: Ia30177613ff7fbb1b9ba573e564856a887b41f44
Reviewed-on: https://chromium-review.googlesource.com/303496
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Matthew Sartori <msartori@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 2756409..9290feb 100644
--- a/scripts/cros_generate_breakpad_symbols_unittest.py
+++ b/scripts/cros_generate_breakpad_symbols_unittest.py
@@ -244,7 +244,7 @@
     """Normal run -- given an ELF and a debug file"""
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, self.debug_file, self.breakpad_dir)
-    self.assertEqual(ret, 0)
+    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.assertExists(self.sym_file)
@@ -256,7 +256,7 @@
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, breakpad_dir=self.breakpad_dir,
         strip_cfi=True, num_errors=num_errors)
-    self.assertEqual(ret, 0)
+    self.assertEqual(ret, self.sym_file)
     self.assertEqual(num_errors.value, 0)
     self.assertCommandArgs(0, ['dump_syms', '-c', self.elf_file])
     self.assertEqual(self.rc_mock.call_count, 1)
@@ -266,7 +266,7 @@
     """Normal run -- given just an ELF"""
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, breakpad_dir=self.breakpad_dir)
-    self.assertEqual(ret, 0)
+    self.assertEqual(ret, self.sym_file)
     self.assertCommandArgs(0, ['dump_syms', self.elf_file])
     self.assertEqual(self.rc_mock.call_count, 1)
     self.assertExists(self.sym_file)
@@ -277,8 +277,8 @@
       mock_access.return_value = False
       ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
           self.elf_file, breakpad_dir=self.breakpad_dir)
-      self.assertEqual(ret, 0)
-      self.assertCommandArgs(0, ['sudo', '--', 'dump_syms', self.elf_file])
+    self.assertEqual(ret, self.sym_file)
+    self.assertCommandArgs(0, ['sudo', '--', 'dump_syms', self.elf_file])
 
   def testLargeDebugFail(self):
     """Running w/large .debug failed, but retry worked"""
@@ -286,7 +286,7 @@
                               returncode=1)
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, self.debug_file, self.breakpad_dir)
-    self.assertEqual(ret, 0)
+    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(
@@ -302,7 +302,7 @@
                               returncode=1)
     ret = cros_generate_breakpad_symbols.GenerateBreakpadSymbol(
         self.elf_file, self.debug_file, self.breakpad_dir)
-    self.assertEqual(ret, 0)
+    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(