diff options
| author | David Robillard <d@drobilla.net> | 2019-10-14 11:01:21 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-10-14 11:01:21 +0200 |
| commit | fa87543e7d6bb243ff068c64069fc43342041073 (patch) | |
| tree | 92284f108be4868e5aa849da21519e326c81c5a0 /Tools/c_config.py | |
| parent | 2f22513494d9c5092254c428eb487510d81a7857 (diff) | |
| download | autowaf-fa87543e7d6bb243ff068c64069fc43342041073.tar.gz autowaf-fa87543e7d6bb243ff068c64069fc43342041073.tar.bz2 autowaf-fa87543e7d6bb243ff068c64069fc43342041073.zip | |
Upgrade to waf 2.0.18
Diffstat (limited to 'Tools/c_config.py')
| -rw-r--r-- | Tools/c_config.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/c_config.py b/Tools/c_config.py index d546be9..80580cc 100644 --- a/Tools/c_config.py +++ b/Tools/c_config.py @@ -659,20 +659,21 @@ class test_exec(Task.Task): """ color = 'PINK' def run(self): + cmd = [self.inputs[0].abspath()] + getattr(self.generator, 'test_args', []) if getattr(self.generator, 'rpath', None): if getattr(self.generator, 'define_ret', False): - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) + self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd) else: - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) + self.generator.bld.retval = self.generator.bld.exec_command(cmd) else: env = self.env.env or {} env.update(dict(os.environ)) for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') if getattr(self.generator, 'define_ret', False): - self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) + self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd, env=env) else: - self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) + self.generator.bld.retval = self.generator.bld.exec_command(cmd, env=env) @feature('test_exec') @after_method('apply_link') |