aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-26 21:29:09 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-01-02 23:52:50 +0200
commit74f15263b6a9d7fe1f717235a7177e7e4a681d3d (patch)
treec7a5619a6996f44a01716202adab950b7076d95c /mesonbuild/interpreter.py
parentee8a6e6fc5b58b5756f4e01271e77399f2d973bb (diff)
downloadmeson-74f15263b6a9d7fe1f717235a7177e7e4a681d3d.zip
meson-74f15263b6a9d7fe1f717235a7177e7e4a681d3d.tar.gz
meson-74f15263b6a9d7fe1f717235a7177e7e4a681d3d.tar.bz2
Can set envvars in test setups.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index f561062..fb1ff20 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -30,6 +30,7 @@ from .interpreterbase import InterpreterException, InvalidArguments, InvalidCode
from .interpreterbase import InterpreterObject, MutableInterpreterObject
import os, sys, shutil, uuid
+import re
import importlib
@@ -1207,7 +1208,7 @@ class Interpreter(InterpreterBase):
'add_project_arguments': self.func_add_project_arguments,
'add_global_link_arguments': self.func_add_global_link_arguments,
'add_project_link_arguments': self.func_add_project_link_arguments,
- 'add_test_setup' : self.func_add_test_setup,
+ 'add_test_setup': self.func_add_test_setup,
'add_languages': self.func_add_languages,
'find_program': self.func_find_program,
'find_library': self.func_find_library,
@@ -2146,6 +2147,8 @@ requirements use the version keyword argument instead.''')
if len(args) != 1:
raise InterpreterException('Add_test_setup needs one argument for the setup name.')
setup_name = args[0]
+ if re.fullmatch('[_a-zA-Z][_0-9a-zA-Z]*', setup_name) is None:
+ raise InterpreterException('Setup name may only contain alphanumeric characters.')
try:
exe_wrapper = mesonlib.stringlistify(kwargs['exe_wrapper'])
except KeyError: