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
changes/13/6668613/2
Fumitoshi Ukai 3 days ago
parent 3f633ff2f9
commit af49d9c7e7

@ -417,6 +417,7 @@ def _main_inner(input_args, build_id, should_collect_logs=False):
# Do not authenticate when using Reproxy. # Do not authenticate when using Reproxy.
'-project=', '-project=',
'-reapi_instance=', '-reapi_instance=',
'-reapi_address=',
] + input_args[1:], ] + input_args[1:],
should_collect_logs) should_collect_logs)
return siso.main(["siso", "ninja"] + input_args[1:]) return siso.main(["siso", "ninja"] + input_args[1:])

@ -153,13 +153,14 @@ def use_reclient_value(output_dir):
'0.0') '0.0')
autoninja.main(['autoninja.py', '-C', out_dir]) autoninja.main(['autoninja.py', '-C', out_dir])
siso_main.assert_called_once_with([ siso_main.assert_called_once_with([
'siso', 'ninja', '-project=', '-reapi_instance=', '-C', 'siso', 'ninja', '-project=', '-reapi_instance=',
out_dir '-reapi_address=', '-C', out_dir
]) ])
self.assertEqual(len(reclient_helper_calls), 1) self.assertEqual(len(reclient_helper_calls), 1)
self.assertEqual( self.assertEqual(reclient_helper_calls[0][0], [
reclient_helper_calls[0][0], 'siso', 'ninja', '-project=', '-reapi_instance=', '-reapi_address=',
['siso', 'ninja', '-project=', '-reapi_instance=', '-C', out_dir]) '-C', out_dir
])
self.assertEqual(reclient_helper_calls[0][1], 'autosiso') self.assertEqual(reclient_helper_calls[0][1], 'autosiso')
@mock.patch('sys.platform', 'win32') @mock.patch('sys.platform', 'win32')

Loading…
Cancel
Save