aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mtest.py
diff options
context:
space:
mode:
authorWilliam Toohey <wtoohey@tritium.com.au>2021-12-10 11:56:52 +1000
committerJussi Pakkanen <jpakkane@gmail.com>2021-12-11 21:26:36 +0200
commitbad383f6b3e8aba53e379caa122623e438d5a49d (patch)
tree1c5413e48cd94af6d068263a486137e206d759fd /mesonbuild/mtest.py
parentf45a21af1e8c23478e5e4a6ef0e3ca0068ab0e39 (diff)
downloadmeson-bad383f6b3e8aba53e379caa122623e438d5a49d.zip
meson-bad383f6b3e8aba53e379caa122623e438d5a49d.tar.gz
meson-bad383f6b3e8aba53e379caa122623e438d5a49d.tar.bz2
Activate VS env when running `meson test`
Diffstat (limited to 'mesonbuild/mtest.py')
-rw-r--r--mesonbuild/mtest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index 37e60df..3fe7f96 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -44,7 +44,7 @@ from . import mlog
from .coredata import major_versions_differ, MesonVersionMismatchException
from .coredata import version as coredata_version
from .mesonlib import (MesonException, OrderedSet, RealPathAction,
- get_wine_shortpath, join_args, split_args)
+ get_wine_shortpath, join_args, split_args, setup_vsenv)
from .mintro import get_infodir, load_info_file
from .programs import ExternalProgram
from .backend.backends import TestProtocol, TestSerialisation
@@ -2001,6 +2001,9 @@ def run(options: argparse.Namespace) -> int:
print(f'Could not find requested program: {check_bin!r}')
return 1
+ b = build.load(options.wd)
+ setup_vsenv(b.need_vsenv)
+
with TestHarness(options) as th:
try:
if options.list: