From af49d9c7e7d5df9d0d19e3645b40aef4597b028e Mon Sep 17 00:00:00 2001 From: Fumitoshi Ukai Date: Wed, 25 Jun 2025 09:31:08 +0900 Subject: [PATCH] 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 --- autoninja.py | 1 + tests/autoninja_test.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/autoninja.py b/autoninja.py index 5a61c66c0..42281af90 100755 --- a/autoninja.py +++ b/autoninja.py @@ -417,6 +417,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 siso.main(["siso", "ninja"] + input_args[1:]) diff --git a/tests/autoninja_test.py b/tests/autoninja_test.py index 941d0dbab..1c2751785 100755 --- a/tests/autoninja_test.py +++ b/tests/autoninja_test.py @@ -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')