aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-09-11 15:02:48 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-09-11 15:02:48 +0300
commitc970d656b17c74f81ba83a994cb215b1450343ed (patch)
treec10ebe97dc52e487344ef59d425ff4ab8b9afd7b
parentc334eeda76c1c4a5d7a150c7af5976ea7a73c7ad (diff)
downloadmeson-c970d656b17c74f81ba83a994cb215b1450343ed.zip
meson-c970d656b17c74f81ba83a994cb215b1450343ed.tar.gz
meson-c970d656b17c74f81ba83a994cb215b1450343ed.tar.bz2
All_args should always be a list. Closes #778.
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--test cases/common/58 run target/meson.build2
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1ef4133..9584950 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1877,6 +1877,8 @@ class Interpreter():
if not 'command' in kwargs:
raise InterpreterException('Missing "command" keyword argument')
all_args = kwargs['command']
+ if not isinstance(all_args, list):
+ all_args = [all_args]
deps = kwargs.get('depends', [])
if not isinstance(deps, list):
deps = [deps]
diff --git a/test cases/common/58 run target/meson.build b/test cases/common/58 run target/meson.build
index 0ab41b3..5824c74 100644
--- a/test cases/common/58 run target/meson.build
+++ b/test cases/common/58 run target/meson.build
@@ -42,4 +42,4 @@ run_target('ct_in_arg',
# 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])
+ command : hex)