Merge pull request #768 from mesonbuild/rtfixes

Fixes for run_targets

mesonbuild/backend/ninjabackend.py

@@ -424,6 +424,8 @@ int dummy;
             elif isinstance(i, (build.BuildTarget, build.CustomTarget)):
                 relfname = self.get_target_filename(i)
                 arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname))
+            elif isinstance(i, mesonlib.File):
+                arg_strings.append(i.rel_to_builddir(self.build_to_src))
             else:
                 mlog.debug(str(i))
                 raise MesonException('Unreachable code in generate_run_target.')
@@ -446,6 +448,9 @@ int dummy;
             cmd.append(abs_exe)
         elif isinstance(texe, dependencies.ExternalProgram):
             cmd += texe.get_command()
+        elif isinstance(texe, build.CustomTarget):
+            deps.append(self.get_target_filename(texe))
+            cmd += [os.path.join(self.environment.get_build_dir(), self.get_target_filename(texe))]
         else:
             cmd.append(target.command)
         cmd += arg_strings

mesonbuild/interpreter.py

@@ -1873,12 +1873,12 @@ class Interpreter():
             raise InterpreterException('Run_target needs at least one positional argument.')
 
         cleaned_args = []
-        for i in all_args:
+        for i in mesonlib.flatten(all_args):
             try:
                 i = i.held_object
             except AttributeError:
                 pass
-            if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram)):
+            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.')
             cleaned_args.append(i)

test cases/common/58 run target/meson.build

@@ -34,3 +34,12 @@ run_target('upload2',
 python3 = find_program('python3')
 run_target('py3hi',
   command : [python3, '-c', 'print("I am Python3.")'])
+
+run_target('ct_in_arg',
+  command : ['echo', hex, files('helloprinter.c')])
+
+# What if the output of a custom_target is the command to
+# execute. Obviously this will not work as hex is not an
+# executable but test that the output is generated correctly.
+run_target('donotrunme',
+  command : [hex])