Fix run_target() accepting ConfigureFile for command

pull/2104/head
Patrick Griffis 8 years ago committed by Jussi Pakkanen
parent 035b2525ac
commit 67f0a1a44d
  1. 2
      mesonbuild/backend/ninjabackend.py
  2. 3
      test cases/common/58 run target/configure.in
  3. 11
      test cases/common/58 run target/meson.build

@ -560,6 +560,8 @@ int dummy;
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))]
elif isinstance(texe, mesonlib.File):
cmd.append(texe.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir()))
else:
cmd.append(target.command)
cmd += arg_strings

@ -0,0 +1,3 @@
#!/usr/bin/env python3
print('Success')

@ -49,3 +49,14 @@ run_target('check_exists',
# executable but test that the output is generated correctly.
run_target('donotrunme',
command : hex)
# Ensure configure files can be passed
conf = configure_file(
input: 'configure.in',
output: 'configure',
configuration: configuration_data()
)
run_target('configure_script',
command : conf
)

Loading…
Cancel
Save