From dc683218a4dbb099d0da1c46e4e7bfe4f19ad9ce Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 1 Jul 2018 19:45:03 +0300 Subject: [PATCH] Proper error message for non-found exe in run_target. Closes #3818 --- mesonbuild/interpreter.py | 2 ++ test cases/failing/81 unfound run/meson.build | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 test cases/failing/81 unfound run/meson.build diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 5a9cc22ef..2cf17524a 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3087,6 +3087,8 @@ root and issuing %s. if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram, mesonlib.File)): mlog.debug('Wrong type:', str(i)) raise InterpreterException('Invalid argument to run_target.') + if isinstance(i, dependencies.ExternalProgram) and not i.found(): + raise InterpreterException('Tried to use non-existing executable {!r}'.format(i.name)) cleaned_args.append(i) name = args[0] if not isinstance(name, str): diff --git a/test cases/failing/81 unfound run/meson.build b/test cases/failing/81 unfound run/meson.build new file mode 100644 index 000000000..3f37e9a06 --- /dev/null +++ b/test cases/failing/81 unfound run/meson.build @@ -0,0 +1,4 @@ +project('unfound runtarget') + +exe = find_program('nonexisting_prog', required : false) +run_target('invoke_fail', command : [exe])