aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-02-08 21:46:00 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-08 23:19:41 +0200
commit71784e1002fe7a5507111273d78ddc8ed654e8de (patch)
treec92b7f2396a8aa5833f6afc199882050a6c6bffe /run_unittests.py
parent398df5629863e913fa603cbf02c525a9f501f8a8 (diff)
downloadmeson-71784e1002fe7a5507111273d78ddc8ed654e8de.zip
meson-71784e1002fe7a5507111273d78ddc8ed654e8de.tar.gz
meson-71784e1002fe7a5507111273d78ddc8ed654e8de.tar.bz2
Fix exe wrapper detection for run targets.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 23bdff4..e53f0c7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -7881,7 +7881,6 @@ class LinuxCrossMingwTests(BaseLinuxCrossTests):
# Force tracebacks so we can detect them properly
env = {'MESON_FORCE_BACKTRACE': '1'}
error_message = "An exe_wrapper is needed but was not found. Please define one in cross file and check the command and/or add it to PATH."
- error_message2 = "The exe_wrapper 'broken' defined in the cross file is needed by run target 'run-prog', but was not found. Please check the command and/or add it to PATH."
with self.assertRaises(MesonException) as cm:
# Must run in-process or we'll get a generic CalledProcessError
@@ -7895,7 +7894,7 @@ class LinuxCrossMingwTests(BaseLinuxCrossTests):
self.init(testdir, extra_args='-Dcustom-target=false',
inprocess=True,
override_envvars=env)
- self.assertEqual(str(cm.exception), error_message2)
+ self.assertEqual(str(cm.exception), error_message)
self.init(testdir, extra_args=['-Dcustom-target=false', '-Drun-target=false'],
override_envvars=env)