diff options
37 files changed, 43 insertions, 43 deletions
diff --git a/interpreter.py b/interpreter.py index 23f0b78..99205d9 100755 --- a/interpreter.py +++ b/interpreter.py @@ -620,7 +620,7 @@ class Interpreter(): 'static_library' : self.func_static_lib, 'shared_library' : self.func_shared_lib, 'generator' : self.func_generator, - 'add_test' : self.func_add_test, + 'test' : self.func_test, 'headers' : self.func_headers, 'man' : self.func_man, 'subdir' : self.func_subdir, @@ -822,7 +822,7 @@ class Interpreter(): self.generators.append(gen) return gen - def func_add_test(self, node, args, kwargs): + def func_test(self, node, args, kwargs): self.validate_arguments(args, 2, [str, Executable]) t = Test(args[0], args[1]) self.build.tests.append(t) diff --git a/test cases/common/1 trivial/meson.build b/test cases/common/1 trivial/meson.build index 44bc486..2e0426a 100644 --- a/test cases/common/1 trivial/meson.build +++ b/test cases/common/1 trivial/meson.build @@ -5,4 +5,4 @@ sources = 'trivial.c' exe = executable('trivialprog', sources : sources) -add_test('runtest', exe) # This is a comment +test('runtest', exe) # This is a comment diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build index ff4c9ea..98dfd48 100644 --- a/test cases/common/16 configure file/meson.build +++ b/test cases/common/16 configure file/meson.build @@ -12,4 +12,4 @@ output : 'config.h', configuration : conf) e = executable('inctest', 'prog.c', include_dirs : include_directories('.')) -add_test('inctest', e) +test('inctest', e) diff --git a/test cases/common/17 if/meson.build b/test cases/common/17 if/meson.build index f163d74..5d6a005 100644 --- a/test cases/common/17 if/meson.build +++ b/test cases/common/17 if/meson.build @@ -11,4 +11,4 @@ if var2 exe = executable('breakbreakbreak', 'crashing.c') endif -add_test('iftest', exe) +test('iftest', exe) diff --git a/test cases/common/18 else/meson.build b/test cases/common/18 else/meson.build index 1555384..99cb927 100644 --- a/test cases/common/18 else/meson.build +++ b/test cases/common/18 else/meson.build @@ -8,4 +8,4 @@ else exe = executable('prog', 'prog.c') endif -add_test('elsetest', exe) +test('elsetest', exe) diff --git a/test cases/common/19 comparison/meson.build b/test cases/common/19 comparison/meson.build index 27f9122..290c7b4 100644 --- a/test cases/common/19 comparison/meson.build +++ b/test cases/common/19 comparison/meson.build @@ -27,7 +27,7 @@ else exe4 = executable('prog4', 'prog.c') endif -add_test('equalfalse', exe1) -add_test('equaltrue', exe2) -add_test('nequaltrue', exe3) -add_test('nequalfalse', exe4) +test('equalfalse', exe1) +test('equaltrue', exe2) +test('nequaltrue', exe3) +test('nequalfalse', exe4) diff --git a/test cases/common/2 cxx/meson.build b/test cases/common/2 cxx/meson.build index 0352d0d..47333ba 100644 --- a/test cases/common/2 cxx/meson.build +++ b/test cases/common/2 cxx/meson.build @@ -1,3 +1,3 @@ project('c++ test', 'cxx') exe = executable('trivialprog', 'trivial.cc') -add_test('runtest', exe) +test('runtest', exe) diff --git a/test cases/common/20 array/meson.build b/test cases/common/20 array/meson.build index 611e94e..0d17374 100644 --- a/test cases/common/20 array/meson.build +++ b/test cases/common/20 array/meson.build @@ -5,4 +5,4 @@ arr = [ 'prog.c'] exe = executable('prog', sources : arr) -add_test('arr test', exe) +test('arr test', exe) diff --git a/test cases/common/21 includedir/src/meson.build b/test cases/common/21 includedir/src/meson.build index 5eaeab6..5c32443 100644 --- a/test cases/common/21 includedir/src/meson.build +++ b/test cases/common/21 includedir/src/meson.build @@ -1,2 +1,2 @@ exe = executable('prog', 'prog.c', 'func.c', include_dirs : inc) -add_test('inc test', exe) +test('inc test', exe) diff --git a/test cases/common/22 header in file list/meson.build b/test cases/common/22 header in file list/meson.build index 09c302c..cc30c71 100644 --- a/test cases/common/22 header in file list/meson.build +++ b/test cases/common/22 header in file list/meson.build @@ -1,4 +1,4 @@ project('header in file list', 'c') exe = executable('prog', 'prog.c', 'header.h') -add_test('basic', exe) +test('basic', exe) diff --git a/test cases/common/23 global arg/meson.build b/test cases/common/23 global arg/meson.build index 7ab6d44..9d916a2 100644 --- a/test cases/common/23 global arg/meson.build +++ b/test cases/common/23 global arg/meson.build @@ -6,6 +6,6 @@ add_global_arguments('-DMYCXXTHING', language : 'cxx') exe1 = executable('prog', 'prog.c') exe2 = executable('prog2', 'prog.cc') -add_test('prog1', exe1) -add_test('prog2', exe2) +test('prog1', exe1) +test('prog2', exe2) diff --git a/test cases/common/24 target arg/meson.build b/test cases/common/24 target arg/meson.build index a9ba17b..edeae45 100644 --- a/test cases/common/24 target arg/meson.build +++ b/test cases/common/24 target arg/meson.build @@ -4,4 +4,4 @@ exe1 = executable('prog', 'prog.cc', 'func.c', \ c_args : '-DCTHING', \ cxx_args : '-DCXXTHING') -add_test('prog1', exe1) +test('prog1', exe1) diff --git a/test cases/common/25 numbers/meson.build b/test cases/common/25 numbers/meson.build index ea965b0..243f2ab 100644 --- a/test cases/common/25 numbers/meson.build +++ b/test cases/common/25 numbers/meson.build @@ -4,4 +4,4 @@ if host.pointer_size() == 64 add_global_arguments('-DIS64', language : 'c') endif -add_test('sizetest', executable('prog', 'prog.c')) +test('sizetest', executable('prog', 'prog.c')) diff --git a/test cases/common/26 endian/meson.build b/test cases/common/26 endian/meson.build index 54bdda2..d4382c4 100644 --- a/test cases/common/26 endian/meson.build +++ b/test cases/common/26 endian/meson.build @@ -4,4 +4,4 @@ if host.is_big_endian() add_global_arguments('c', '-DIS_BE') endif -add_test('endiantest', executable('prog', 'prog.c')) +test('endiantest', executable('prog', 'prog.c')) diff --git a/test cases/common/28 config subdir/src/meson.build b/test cases/common/28 config subdir/src/meson.build index 9908c58..aa99c12 100644 --- a/test cases/common/28 config subdir/src/meson.build +++ b/test cases/common/28 config subdir/src/meson.build @@ -1,2 +1,2 @@ exe = executable('prog', 'prog.c', include_dirs : inc) -add_test('subdir config', exe) +test('subdir config', exe) diff --git a/test cases/common/29 pipeline/meson.build b/test cases/common/29 pipeline/meson.build index 53be502..151b9d2 100644 --- a/test cases/common/29 pipeline/meson.build +++ b/test cases/common/29 pipeline/meson.build @@ -10,4 +10,4 @@ generated = gen.process('input_src.dat') e2 = executable('prog', 'prog.c', generated) -add_test('pipelined', e2) +test('pipelined', e2) diff --git a/test cases/common/30 pipeline/meson.build b/test cases/common/30 pipeline/meson.build index f25d4c4..3fb94d1 100644 --- a/test cases/common/30 pipeline/meson.build +++ b/test cases/common/30 pipeline/meson.build @@ -10,4 +10,4 @@ generated = gen.process('input_src.dat') e2 = executable('prog', 'prog.c', generated) -add_test('pipelined', e2)
\ No newline at end of file +test('pipelined', e2)
\ No newline at end of file diff --git a/test cases/common/31 find program/meson.build b/test cases/common/31 find program/meson.build index 9dae882..ec9c33b 100644 --- a/test cases/common/31 find program/meson.build +++ b/test cases/common/31 find program/meson.build @@ -16,5 +16,5 @@ else generated = gen.process('source.in') e = executable('prog', generated) - add_test('external exe', e) + test('external exe', e) endif diff --git a/test cases/common/35 sizeof/meson.build b/test cases/common/35 sizeof/meson.build index b676fa9..2656160 100644 --- a/test cases/common/35 sizeof/meson.build +++ b/test cases/common/35 sizeof/meson.build @@ -10,4 +10,4 @@ cd.set('WCHARSIZE', wcharsize) configure_file(input : 'config.h.in', output : 'config.h', configuration : cd) e = executable('prog', 'prog.c', include_dirs : include_directories('.')) -add_test('sizeof test', e) +test('sizeof test', e) diff --git a/test cases/common/5 linkstatic/meson.build b/test cases/common/5 linkstatic/meson.build index 8c8aebc..5eaa942 100644 --- a/test cases/common/5 linkstatic/meson.build +++ b/test cases/common/5 linkstatic/meson.build @@ -2,4 +2,4 @@ project('static library linking test', 'c') lib = static_library('mylib', 'libfile.c') exe = executable('prog', 'main.c', link_with : lib) -add_test('runtest', exe) +test('runtest', exe) diff --git a/test cases/common/6 linkshared/meson.build b/test cases/common/6 linkshared/meson.build index 3e646f4..8e10295 100644 --- a/test cases/common/6 linkshared/meson.build +++ b/test cases/common/6 linkshared/meson.build @@ -4,4 +4,4 @@ lib = shared_library('mylib', , install : true) exe = executable('prog', 'main.c', link_with : lib, install : true) -add_test('runtest', exe) +test('runtest', exe) diff --git a/test cases/common/7 mixed/meson.build b/test cases/common/7 mixed/meson.build index 3e32508..7731551 100644 --- a/test cases/common/7 mixed/meson.build +++ b/test cases/common/7 mixed/meson.build @@ -1,3 +1,3 @@ project('mixed C and C++', 'c', 'cxx') exe = executable('prog', 'main.cc', 'func.c') -add_test('mixtest', exe) +test('mixtest', exe) diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index 82a5e54..5ba89a0 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -10,5 +10,5 @@ linkdep = find_dep('boost', modules : 'thread') nolinkexe = executable('nolinkedexe', 'nolinkexe.cc', deps : nolinkdep) linkexe = executable('linkedexe', 'linkexe.cc', deps : linkdep) -add_test('Boost nolinktext', nolinkexe) -add_test('Boost linktext', linkexe) +test('Boost nolinktext', nolinkexe) +test('Boost linktext', linkexe) diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build index a664c35..6527b4c 100644 --- a/test cases/frameworks/2 gtest/meson.build +++ b/test cases/frameworks/2 gtest/meson.build @@ -3,4 +3,4 @@ project('gtest', 'cxx') gtest = find_dep('gtest') e = executable('testprog', 'test.cc', deps : gtest) -add_test('gtest test', e) +test('gtest test', e) diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build index 90ae79c..f15e71e 100644 --- a/test cases/frameworks/3 gmock/meson.build +++ b/test cases/frameworks/3 gmock/meson.build @@ -7,4 +7,4 @@ gtest = find_dep('gtest') gmock = find_dep('gmock') e = executable('gmocktest', 'gmocktest.cc', deps : [gtest, gmock]) -add_test('gmock test', e) +test('gmock test', e) diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index a11d261..9ab23b3 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -8,4 +8,4 @@ moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool befo ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol. deps : qt5dep) -add_test('qt5test', q5exe) +test('qt5test', q5exe) diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build index 7a18b25..9fd2b5d 100644 --- a/test cases/frameworks/5 protocol buffers/meson.build +++ b/test cases/frameworks/5 protocol buffers/meson.build @@ -10,4 +10,4 @@ gen = generator(protoc, \ generated = gen.process('defs.proto') e = executable('prog', 'main.cpp', generated, deps : dep) -add_test('prototest', e) +test('prototest', e) diff --git a/test cases/linuxlike/1 pkg-config/meson.build b/test cases/linuxlike/1 pkg-config/meson.build index 8032449..eb2846a 100644 --- a/test cases/linuxlike/1 pkg-config/meson.build +++ b/test cases/linuxlike/1 pkg-config/meson.build @@ -5,7 +5,7 @@ project('external dependency', 'c') dep = find_dep('zlib') exe = executable('zlibprog', 'prog.c', deps : dep) -add_test('zlibtest', exe) +test('zlibtest', exe) # Try to find a nonexistant library to ensure requires:false works. diff --git a/test cases/linuxlike/2 external library/meson.build b/test cases/linuxlike/2 external library/meson.build index 7f904fc..e0dfa8e 100644 --- a/test cases/linuxlike/2 external library/meson.build +++ b/test cases/linuxlike/2 external library/meson.build @@ -2,4 +2,4 @@ project('external library', 'c') zlib = find_library('z') e = executable('zprog', 'prog.c', deps : zlib) -add_test('libtest', e) +test('libtest', e) diff --git a/test cases/objc/1 simple/meson.build b/test cases/objc/1 simple/meson.build index 5bad8b0..b004e6b 100644 --- a/test cases/objc/1 simple/meson.build +++ b/test cases/objc/1 simple/meson.build @@ -1,4 +1,4 @@ project('objective c', 'objc') exe = executable('prog', 'prog.m') -add_test('objctest', exe) +test('objctest', exe) diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build index 0615008..a554137 100644 --- a/test cases/objc/2 nsstring/meson.build +++ b/test cases/objc/2 nsstring/meson.build @@ -6,4 +6,4 @@ else dep = find_dep('gnustep') endif exe = executable('stringprog', 'stringprog.m', deps : dep) -add_test('stringtest', exe) +test('stringtest', exe) diff --git a/test cases/objc/3 objc++/meson.build b/test cases/objc/3 objc++/meson.build index a7b3681..05589b7 100644 --- a/test cases/objc/3 objc++/meson.build +++ b/test cases/objc/3 objc++/meson.build @@ -1,4 +1,4 @@ project('Objective C++', 'objcxx') exe = executable('objcxxprog', 'prog.mm') -add_test('objcxx', exe) +test('objcxx', exe) diff --git a/test cases/osx/1 basic/meson.build b/test cases/osx/1 basic/meson.build index e9f1c91..e0412e1 100644 --- a/test cases/osx/1 basic/meson.build +++ b/test cases/osx/1 basic/meson.build @@ -1,3 +1,3 @@ project('osx fundamentals', 'c') e = executable('prog', 'main.c') -add_test('basic', e) +test('basic', e) diff --git a/test cases/windows/1 basic/meson.build b/test cases/windows/1 basic/meson.build index fcbc557..f736b66 100644 --- a/test cases/windows/1 basic/meson.build +++ b/test cases/windows/1 basic/meson.build @@ -1,4 +1,4 @@ project('wintest', 'c') prog = executable('prog', 'prog.c') -add_test('wintest', prog) +test('wintest', prog) diff --git a/test cases/windows/2 winmain/meson.build b/test cases/windows/2 winmain/meson.build index 46edf35..ed5c2c8 100644 --- a/test cases/windows/2 winmain/meson.build +++ b/test cases/windows/2 winmain/meson.build @@ -1,4 +1,4 @@ project('winmain', 'c') exe = executable('prog', 'prog.c') -add_test('winmain', exe) +test('winmain', exe) diff --git a/test cases/windows/3 cpp/meson.build b/test cases/windows/3 cpp/meson.build index b300b89..2efe420 100644 --- a/test cases/windows/3 cpp/meson.build +++ b/test cases/windows/3 cpp/meson.build @@ -1,4 +1,4 @@ project('wincxx', 'cxx') exe = executable('prog', 'prog.cpp') -add_test('wincxx', exe) +test('wincxx', exe) diff --git a/test cases/windows/4 winmaincpp/meson.build b/test cases/windows/4 winmaincpp/meson.build index e59511e..5ccd3e6 100644 --- a/test cases/windows/4 winmaincpp/meson.build +++ b/test cases/windows/4 winmaincpp/meson.build @@ -1,4 +1,4 @@ project('winmaincpp', 'cxx') exe = executable('prog', 'prog.cpp') -add_test('winmaincpp', exe) +test('winmaincpp', exe) |