Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido committed Dec 5, 2024
1 parent ae00de8 commit c0fae07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/functional/toolchains/env/test_virtualenv_powershell.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ def build(self):
client.save({"conanfile.py": conanfile, "hello.cpp": hello_cpp, "CMakeLists.txt": cmakelists})
powershell_exe = "powershell.exe" if powershell == "powershell" else "pwsh"
client.run(f"build . -c tools.env.virtualenv:powershell={powershell} -c tools.cmake.cmaketoolchain:generator=Ninja")
client.run_command(rf'{powershell_exe} ".\build\Release\generators\conanbuild.ps1; dir env:"')
client.run_command(rf'{powershell_exe} -Command ".\build\Release\generators\conanbuild.ps1; dir env:"')
#check the conanbuid.ps1 activation message
assert "conanvcvars.ps1: Activated environment" in client.out
#check that the new env variables are set
assert "VSCMD_ARG_VCVARS_VER" in client.out

client.run_command(rf'{powershell_exe} ".\build\Release\generators\conanvcvars.ps1"')
client.run_command(rf'{powershell_exe} -Command ".\build\Release\generators\conanvcvars.ps1"')
assert client.out.strip() == "conanvcvars.ps1: Activated environment"

conanbuild = client.load(r".\build\Release\generators\conanbuild.ps1")
Expand Down

0 comments on commit c0fae07

Please sign in to comment.