From 1b8edd9abb2544b5f8c62bf6ace85483f4b9c263 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Wed, 12 Jul 2023 23:09:11 +0100 Subject: [PATCH] test/test_pkgrel_bump: make sure pmb doesn't cross compile When build_default_device_arch is set in your local pmbootstrap config, some tests fail because pmbootstrap tries to cross compile. Make sure this option is disabled in the test context. Signed-off-by: Caleb Connolly Reviewed-by: Oliver Smith Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230629-suffix-type-hint-v1-5-e92802ae20a8@postmarketos.org%3E --- test/test_pkgrel_bump.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test_pkgrel_bump.py b/test/test_pkgrel_bump.py index ee1e1778..b6350a84 100644 --- a/test/test_pkgrel_bump.py +++ b/test/test_pkgrel_bump.py @@ -128,6 +128,9 @@ def test_pkgrel_bump_high_level(args, tmpdir): tmpdir = str(tmpdir) setup_work(args, tmpdir) + # Make sure we don't try and cross compile + pmbootstrap(args, tmpdir, ["config", "build_default_device_arch", "False"]) + # Let pkgrel_bump exit normally pmbootstrap(args, tmpdir, ["build", "testlib", "testapp", "testsubpkg"]) pmbootstrap(args, tmpdir, ["pkgrel_bump", "--dry", "--auto"])