aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2023-03-24 09:10:29 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2023-03-28 00:36:37 +0300
commit42c4058304d8278fb96033a0ae9ce744c3632e66 (patch)
treece8e21446ae17673dd233ae2299ddf35a26a0bbc /run_tests.py
parent567d1fec9b6f2191535509a5eae29436a024bd70 (diff)
downloadmeson-42c4058304d8278fb96033a0ae9ce744c3632e66.zip
meson-42c4058304d8278fb96033a0ae9ce744c3632e66.tar.gz
meson-42c4058304d8278fb96033a0ae9ce744c3632e66.tar.bz2
unittests: Pass the exact backend name
CI runs with vs2019 and we were passing --backend=vs. This fix reconfigure tests because we can't reconfigure with --backend=vs when initial configuration determined the backend is actually vs2019.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index 68a222c..41c9577 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -358,7 +358,7 @@ def main():
parser.add_argument('--no-unittests', action='store_true', default=False)
(options, _) = parser.parse_known_args()
returncode = 0
- backend, _ = guess_backend(options.backend, shutil.which('msbuild'))
+ _, backend_flags = guess_backend(options.backend, shutil.which('msbuild'))
no_unittests = options.no_unittests
# Running on a developer machine? Be nice!
if not mesonlib.is_windows() and not mesonlib.is_haiku() and 'CI' not in os.environ:
@@ -394,7 +394,7 @@ def main():
else:
print(mlog.bold('Running unittests.'))
print(flush=True)
- cmd = mesonlib.python_command + ['run_unittests.py', '--backend=' + backend.name, '-v']
+ cmd = mesonlib.python_command + ['run_unittests.py', '-v'] + backend_flags
if options.failfast:
cmd += ['--failfast']
returncode += subprocess_call(cmd, env=env)