Skip to content

Commit 3c3d0a5

Browse files
committed
Update test_bootstrap to match the new default compiler clang
Or we will get an tox error on the affected test `test_bootstrap_strip`
1 parent 7cd98f5 commit 3c3d0a5

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

tests/test_bootstrap.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,15 +415,23 @@ def reset_mocks():
415415
@mock.patch("pythonforandroid.bootstrap.shprint")
416416
@mock.patch("pythonforandroid.bootstrap.sh.Command")
417417
@mock.patch("pythonforandroid.build.ensure_dir")
418+
@mock.patch("pythonforandroid.archs.glob")
418419
@mock.patch("pythonforandroid.archs.find_executable")
419420
def test_bootstrap_strip(
420421
self,
421422
mock_find_executable,
423+
mock_glob,
422424
mock_ensure_dir,
423425
mock_sh_command,
424426
mock_sh_print,
425427
):
426-
mock_find_executable.return_value = "arm-linux-androideabi-gcc"
428+
mock_find_executable.return_value = os.path.join(
429+
self.ctx._ndk_dir,
430+
"toolchains/llvm/prebuilt/linux-x86_64/bin/clang",
431+
)
432+
mock_glob.return_value = [
433+
os.path.join(self.ctx._ndk_dir, "toolchains", "llvm")
434+
]
427435
# prepare arch, bootstrap, distribution and PythonRecipe
428436
arch = ArchARMv7_a(self.ctx)
429437
bs = Bootstrap().get_bootstrap(self.bootstrap_name, self.ctx)

0 commit comments

Comments
 (0)