aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-11-10 00:41:04 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-11-10 00:49:53 +0530
commitdaa893e0119f972eae1b55db6e5f4a61799fdd93 (patch)
tree6cd74f878bc23e2d397562212d4462842ceb1b8e
parent9741085068023f9c0c4f37ab3d773801561800fe (diff)
downloadmeson-daa893e0119f972eae1b55db6e5f4a61799fdd93.zip
meson-daa893e0119f972eae1b55db6e5f4a61799fdd93.tar.gz
meson-daa893e0119f972eae1b55db6e5f4a61799fdd93.tar.bz2
tests: Disable 113 generatorcustom on VS backends
Can only test this by checking the compiler id, but that's good enough. Disabling so we can get #995 in which will help keep the VS backend in a better state w.r.t. other PRs. I've opened #1004 to track this in the meantime.
-rw-r--r--test cases/common/113 generatorcustom/meson.build26
1 files changed, 15 insertions, 11 deletions
diff --git a/test cases/common/113 generatorcustom/meson.build b/test cases/common/113 generatorcustom/meson.build
index 1f4cc88..472d565 100644
--- a/test cases/common/113 generatorcustom/meson.build
+++ b/test cases/common/113 generatorcustom/meson.build
@@ -1,17 +1,21 @@
project('generatorcustom', 'c')
-creator = find_program('gen.py')
-catter = find_program('catter.py')
+if meson.get_compiler('c').get_id() != 'msvc'
+ creator = find_program('gen.py')
+ catter = find_program('catter.py')
-gen = generator(creator,
- output: '@BASENAME@.h',
- arguments : ['@INPUT@', '@OUTPUT@'])
+ gen = generator(creator,
+ output: '@BASENAME@.h',
+ arguments : ['@INPUT@', '@OUTPUT@'])
-hs = gen.process('res1.txt', 'res2.txt')
+ hs = gen.process('res1.txt', 'res2.txt')
-allinone = custom_target('alltogether',
- input : hs,
- output : 'alltogether.h',
- command : [catter, '@INPUT@', '@OUTPUT@'])
+ allinone = custom_target('alltogether',
+ input : hs,
+ output : 'alltogether.h',
+ command : [catter, '@INPUT@', '@OUTPUT@'])
-executable('proggie', 'main.c', allinone)
+ executable('proggie', 'main.c', allinone)
+else
+ error('MESON_SKIP_TEST: Skipping test on VS backend; see: https://github.com/mesonbuild/meson/issues/1004')
+endif