Skip to content

Commit

Permalink
Better explanation in alr.py
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Feb 27, 2024
1 parent bb15ac0 commit 3faf720
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions testsuite/drivers/alr.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,16 @@ def prepare_env(config_dir, env):
# We pass config location explicitly in the following calls since env is
# not yet applied (it's just a dict to be passed later to subprocess)

# Set the msys2 path to the default one, so that every test does not try to
# reinstall a new copy in their private config
if platform.system() == "Windows":
# Disable msys inadvertent installation
run_alr("-c", config_dir, "config", "--global",
"--set", "msys2.install_dir",
os.path.join(os.environ.get("LocalAppData"), "alire", "msys64"))
"--set", "msys2.do_not_install", "true")

# And, to make completely sure, disable msys2 installation, as tests
# use their own config that should not rely on a fresh msys2 anyway. On
# GitHub CI, msys2 is set up in advance.
# And configure the one set up in the environment so it is used by
# tests that need it.
run_alr("-c", config_dir, "config", "--global",
"--set", "msys2.do_not_install", "true")
"--set", "msys2.install_dir",
os.path.join(os.environ.get("LocalAppData"), "alire", "msys64"))

# Disable autoconfig of the community index, to prevent unintended use of
# it in tests, besides the overload of fetching it
Expand Down

0 comments on commit 3faf720

Please sign in to comment.