Skip to content

Commit

Permalink
Correct dump_syms optimization flags.
Browse files Browse the repository at this point in the history
This CL fixes the order of option flags to run dump_syms.
Previously the command line was in the wrong order and
running dump_syms without the flags specified.

Bug: 1224717
Change-Id: If595ca53c175f43a45e37305d9778f53c538530b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3047158
Commit-Queue: ssid <ssid@chromium.org>
Reviewed-by: ssid <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#904631}
  • Loading branch information
Ryan Huckleberry authored and Chromium LUCI CQ committed Jul 23, 2021
1 parent 06439ab commit 01157a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/tracing/breakpad_file_extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def ExtractBreakpadFiles(dump_syms_path, build_dir, breakpad_output_dir):
if os.path.isfile(input_file_path) and _IsValidBinaryPath(input_file_path):
# Construct absolute file paths for input and output files.
output_file_path = os.path.join(breakpad_output_dir, file + '.breakpad')
cmd = [dump_syms_path, input_file_path, '-c', '-r']
cmd = [dump_syms_path, '-c', '-r', input_file_path]
if _RunDumpSyms(cmd, output_file_path):
breakpad_file_count += 1

Expand Down
8 changes: 4 additions & 4 deletions tools/tracing/breakpad_file_extractor_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _checkExtractWithOneBinary(self, dump_syms_path, build_dir, breakpad_dir):
breakpad_file_extractor.ExtractBreakpadFiles(dump_syms_path, build_dir,
breakpad_dir)

expected_cmd = [dump_syms_path, test_input_file.name, '-c', '-r']
expected_cmd = [dump_syms_path, '-c', '-r', test_input_file.name]
breakpad_file_extractor._RunDumpSyms.assert_called_once_with(
expected_cmd, test_output_file_path)

Expand Down Expand Up @@ -103,11 +103,11 @@ def testMultipleBinaryFiles(self):

# Check that each call expected call to _RunDumpSyms() has been made.
expected_calls = [
call([self.test_dump_syms_binary, input_files[0].name, '-c', '-r'],
call([self.test_dump_syms_binary, '-c', '-r', input_files[0].name],
output_file_paths[0]),
call([self.test_dump_syms_binary, input_files[1].name, '-c', '-r'],
call([self.test_dump_syms_binary, '-c', '-r', input_files[1].name],
output_file_paths[1]),
call([self.test_dump_syms_binary, input_files[2].name, '-c', '-r'],
call([self.test_dump_syms_binary, '-c', '-r', input_files[2].name],
output_file_paths[2])
]
breakpad_file_extractor._RunDumpSyms.assert_has_calls(expected_calls,
Expand Down

0 comments on commit 01157a6

Please sign in to comment.