diff options
| -rw-r--r-- | interpreter.py | 4 | ||||
| -rw-r--r-- | test cases/common/29 pipeline/meson.build | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py index b6e98dd..edfe59b 100644 --- a/interpreter.py +++ b/interpreter.py @@ -39,8 +39,10 @@ class InvalidArguments(InterpreterException): def check_stringlist(a, msg='Arguments must be strings.'): if not isinstance(a, list): + mlog.debug('Not a list:', str(a)) raise InvalidArguments('Argument not a list.') if not all(isinstance(s, str) for s in a): + mlog.debug('Element not a string:', str(a)) raise InvalidArguments(msg) def noPosargs(f): @@ -1857,7 +1859,7 @@ class Interpreter(): (args, kwargs) = self.reduce_arguments(args) if method_name == 'extract_objects': self.validate_extraction(obj.held_object) - return obj.method_call(method_name, args, kwargs) + return obj.method_call(method_name, self.flatten(args), kwargs) # Only permit object extraction from the same subproject def validate_extraction(self, buildtarget): diff --git a/test cases/common/29 pipeline/meson.build b/test cases/common/29 pipeline/meson.build index faf26af..8418381 100644 --- a/test cases/common/29 pipeline/meson.build +++ b/test cases/common/29 pipeline/meson.build @@ -9,7 +9,7 @@ gen = generator(e1, \ output : '@BASENAME@.c', # Line continuation inside arguments should work without needing a "\". arguments : ['@INPUT@', '@OUTPUT@']) -generated = gen.process('input_src.dat') +generated = gen.process(['input_src.dat']) e2 = executable('prog', 'prog.c', generated) |