Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix installation of win64_msvc2019_arm64 arch

Browse Source 
This fixes the behavior of the `--autodesktop` flag and the updater,
when installing win64_msvc2019_arm64 for desktop targets.
This commit is contained in:
Dave Dalcino
2023-09-06 18:09:02 -07:00
parent 4f2bdda951
commit 5c2c18d96b
5 changed files with 189 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
tests/test_cli.py
View File

@@ -415,58 +415,130 @@ def test_cli_choose_archive_dest(
@pytest.mark.parametrize(
"host, is_auto, mocked_mingw, existing_arch_dirs, expect",
"host, target, arch, is_auto, mocked_arches, existing_arch_dirs, expect",
(
( # not installed
"windows",
"android",
"android_armv7",
False,
"win64_mingw99",
["win64_mingw99"],
["not_mingw"],
{"install": None, "instruct": "win64_mingw99", "use_dir": "mingw99_64"},
),
( # Alt Desktop Qt already installed
"windows",
"android",
"android_armv7",
False,
"win64_mingw99",
["win64_mingw99"],
["mingw128_32"],
{"install": None, "instruct": None, "use_dir": "mingw128_32"},
),
# not installed
("linux", False, None, ["gcc_32"], {"install": None, "instruct": "gcc_64", "use_dir": "gcc_64"}),
(
"linux",
"android",
"android_armv7",
False,
[],
["gcc_32"],
{"install": None, "instruct": "gcc_64", "use_dir": "gcc_64"},
),
( # Desktop Qt already installed
"linux",
"android",
"android_armv7",
False,
None,
[],
["gcc_64"],
{"install": None, "instruct": None, "use_dir": "gcc_64"},
),
( # not installed
"windows",
"android",
"android_armv7",
True,
"win64_mingw99",
["win64_mingw99"],
["not_mingw"],
{"install": "win64_mingw99", "instruct": None, "use_dir": "mingw99_64"},
),
( # Alt Desktop Qt already installed
"windows",
"android",
"android_armv7",
True,
"win64_mingw99",
["win64_mingw99"],
["mingw128_32"],
{"install": None, "instruct": None, "use_dir": "mingw128_32"},
),
# not installed
("linux", True, None, ["gcc_32"], {"install": "gcc_64", "instruct": None, "use_dir": "gcc_64"}),
(
"linux",
"android",
"android_armv7",
True,
[],
["gcc_32"],
{"install": "gcc_64", "instruct": None, "use_dir": "gcc_64"},
),
( # Desktop Qt already installed
"linux",
"android",
"android_armv7",
True,
None,
[],
["gcc_64"],
{"install": None, "instruct": None, "use_dir": "gcc_64"},
),
( # MSVC arm64 with --autodesktop: should install min64_msvc2019_64
"windows",
"desktop",
"win64_msvc2019_arm64",
True,
["win64_mingw", "win64_msvc2019_64", "win64_msvc2019_arm64", "wasm_singlethread", "wasm_multithread"],
["mingw128_32"],
{"install": "win64_msvc2019_64", "instruct": None, "use_dir": "msvc2019_64"},
),
( # MSVC arm64 without --autodesktop: should point to min64_msvc2019_64
"windows",
"desktop",
"win64_msvc2019_arm64",
False,
["win64_mingw", "win64_msvc2019_64", "win64_msvc2019_arm64", "wasm_singlethread", "wasm_multithread"],
["mingw128_32"],
{"install": None, "instruct": "win64_msvc2019_64", "use_dir": "msvc2019_64"},
),
( # MSVC arm64 without --autodesktop, with correct target already installed
"windows",
"desktop",
"win64_msvc2019_arm64",
False,
["win64_mingw", "win64_msvc2019_64", "win64_msvc2019_arm64", "wasm_singlethread", "wasm_multithread"],
["msvc2019_64"],
{"install": None, "instruct": None, "use_dir": "msvc2019_64"},
),
( # MSVC arm64 without --autodesktop, with wrong target already installed
"windows",
"desktop",
"win64_msvc2019_arm64",
False,
["win64_mingw", "win64_msvc2019_64", "win64_msvc2019_arm64", "wasm_singlethread", "wasm_multithread"],
["mingw128_32"],
{"install": None, "instruct": "win64_msvc2019_64", "use_dir": "msvc2019_64"},
),
),
)
def test_get_autodesktop_dir_and_arch(
monkeypatch, capsys, host: str, is_auto: bool, mocked_mingw: str, existing_arch_dirs: List[str], expect: Dict[str, str]
def test_get_autodesktop_dir_and_arch_non_android(
monkeypatch,
capsys,
host: str,
target: str,
arch: str,
is_auto: bool,
mocked_arches: List[str],
existing_arch_dirs: List[str],
expect: Dict[str, str],
):
"""
:is_auto: Simulates passing `--autodesktop` to aqt
@@ -477,16 +549,16 @@ def test_get_autodesktop_dir_and_arch(
:expect[use_dir]: The directory that includes `bin/qmake`; we will patch files in the mobile installation
with this value
"""
monkeypatch.setattr(MetadataFactory, "fetch_arches", lambda *args: [mocked_mingw])
monkeypatch.setattr(MetadataFactory, "fetch_arches", lambda *args: mocked_arches)
monkeypatch.setattr(Cli, "run", lambda *args: 0)
target = "android"
version = "6.2.3"
cli = Cli()
cli._setup_settings()
flavor = "MSVC Arm64" if arch == "win64_msvc2019_arm64" else target
expect_msg_prefix = (
f"You are installing the {target} version of Qt, "
f"You are installing the {flavor} version of Qt, "
f"which requires that the desktop version of Qt is also installed."
)
@@ -497,7 +569,7 @@ def test_get_autodesktop_dir_and_arch(
qmake.parent.mkdir(parents=True)
qmake.write_text("exe file")
autodesktop_arch_dir, autodesktop_arch_to_install = cli._get_autodesktop_dir_and_arch(
is_auto, host, target, base_dir, Version(version)
is_auto, host, target, base_dir, Version(version), arch
)
# It should choose the correct desktop arch directory for updates
assert autodesktop_arch_dir == expect["use_dir"]