mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
autoninja: disable siso native by --reapi_address=
siso v1.3.1 changed the way to enable reapi. It allows empty project and empty reapi_instance. Under reclient mode to disable siso native, set reapi_address empty. Bug: 427569563 Change-Id: Ib653186c5200605032de5c0fddab0b64412db85c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6668613 Reviewed-by: Junji Watanabe <jwata@google.com> Commit-Queue: Fumitoshi Ukai <ukai@google.com> Auto-Submit: Fumitoshi Ukai <ukai@google.com> Commit-Queue: Junji Watanabe <jwata@google.com>
This commit is contained in:
@@ -473,6 +473,7 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
|
||||
# Do not authenticate when using Reproxy.
|
||||
'-project=',
|
||||
'-reapi_instance=',
|
||||
'-reapi_address=',
|
||||
] + input_args[1:],
|
||||
should_collect_logs)
|
||||
return run_siso(["siso", "ninja"] + input_args[1:])
|
||||
|
||||
@@ -153,13 +153,14 @@ def use_reclient_value(output_dir):
|
||||
'0.0')
|
||||
autoninja.main(['autoninja.py', '-C', out_dir])
|
||||
siso_main.assert_called_once_with([
|
||||
'siso', 'ninja', '-project=', '-reapi_instance=', '-C',
|
||||
out_dir
|
||||
'siso', 'ninja', '-project=', '-reapi_instance=',
|
||||
'-reapi_address=', '-C', out_dir
|
||||
])
|
||||
self.assertEqual(len(reclient_helper_calls), 1)
|
||||
self.assertEqual(
|
||||
reclient_helper_calls[0][0],
|
||||
['siso', 'ninja', '-project=', '-reapi_instance=', '-C', out_dir])
|
||||
self.assertEqual(reclient_helper_calls[0][0], [
|
||||
'siso', 'ninja', '-project=', '-reapi_instance=', '-reapi_address=',
|
||||
'-C', out_dir
|
||||
])
|
||||
self.assertEqual(reclient_helper_calls[0][1], 'autosiso')
|
||||
|
||||
@mock.patch('sys.platform', 'win32')
|
||||
|
||||
Reference in New Issue
Block a user