Fix ninjalog_uploader.py to exclude /path/to/depot_tools/ninja.py

Bug: b/270907050
Change-Id: I2bb5ffbb9ae8590078c92e2c7e0095f28f0c21be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4297356
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
changes/56/4297356/5
Junji Watanabe 2 years ago committed by LUCI CQ
parent b48200edc1
commit 07edc50f39

@ -75,8 +75,8 @@ def ParseGNArgs(gn_args):
def GetBuildTargetFromCommandLine(cmdline):
"""Get build targets from commandline."""
# Skip argv0.
idx = 1
# Skip argv0, argv1: ['/path/to/python3', '/path/to/depot_tools/ninja.py']
idx = 2
# Skipping all args that involve these flags, and taking all remaining args
# as targets.

@ -93,26 +93,34 @@ class NinjalogUploaderTest(unittest.TestCase):
'out/Debug/.ninja_log')
def test_get_build_target_from_command_line(self):
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', 'chrome']), ['chrome'])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', 'chrome']), ['chrome'])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja']), [])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(['python3',
'ninja.py']), [])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', '-j', '1000', 'chrome']), ['chrome'])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', '-j', '1000', 'chrome']), ['chrome'])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', 'chrome', '-j', '1000']), ['chrome'])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', 'chrome', '-j', '1000']), ['chrome'])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', '-C', 'chrome']), [])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', '-C', 'chrome']), [])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', '-Cout/Release', 'chrome']), ['chrome'])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', '-Cout/Release', 'chrome']), ['chrome'])
self.assertEqual(ninjalog_uploader.GetBuildTargetFromCommandLine(
['ninja', '-C', 'out/Release', 'chrome', 'all']), ['chrome', 'all'])
self.assertEqual(
ninjalog_uploader.GetBuildTargetFromCommandLine(
['python3', 'ninja.py', '-C', 'out/Release', 'chrome', 'all']),
['chrome', 'all'])
def test_get_j_flag(self):
self.assertEqual(ninjalog_uploader.GetJflag(

Loading…
Cancel
Save