aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-07-31 21:28:45 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-07-31 21:28:45 +0300
commitdf9d1bcbfc868b89110ef9e23bb8ac7809c927f6 (patch)
treec5a2f61cc1aed4dd72fa53df07bf554201aabecc
parent9e122005cf5aa1ac288f9d7229d1fc2f7d472270 (diff)
downloadmeson-df9d1bcbfc868b89110ef9e23bb8ac7809c927f6.zip
meson-df9d1bcbfc868b89110ef9e23bb8ac7809c927f6.tar.gz
meson-df9d1bcbfc868b89110ef9e23bb8ac7809c927f6.tar.bz2
Simpler name.
-rw-r--r--interpreter.py2
-rw-r--r--test cases/common/33 try compile/meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/interpreter.py b/interpreter.py
index 359e50c..75fad04 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -734,7 +734,7 @@ class CompilerHolder(InterpreterObject):
if len(args) != 1:
raise InterpreterException('compiles method takes exactly one argument.')
string = args[0]
- testname = kwargs.get('testname', '')
+ testname = kwargs.get('name', '')
if not isinstance(testname, str):
raise InterpreterException('Testname argument must be a string.')
if isinstance(string, nodes.StringStatement):
diff --git a/test cases/common/33 try compile/meson.build b/test cases/common/33 try compile/meson.build
index 010e844..beafb93 100644
--- a/test cases/common/33 try compile/meson.build
+++ b/test cases/common/33 try compile/meson.build
@@ -9,10 +9,10 @@ void func() { printf("This won't work.\n"); }
'''
compiler = meson.get_compiler('c')
-if compiler.compiles(code, testname : 'should succeed') == false
+if compiler.compiles(code, name : 'should succeed') == false
error('Compiler is fail.')
endif
-if compiler.compiles(breakcode, testname : 'should fail')
+if compiler.compiles(breakcode, name : 'should fail')
error('Compiler returned true on broken code.')
endif