aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2017-03-19 20:12:53 +0100
committerNicolas Schneider <nioncode+git@gmail.com>2017-03-20 14:33:44 +0100
commit59984f501412cb2c8b8643a6b5ee4933c891d99e (patch)
tree238690c7c64e3999b6a1aa27ac4b153da35f9edf
parent1aa940d8444e1f2452ee7b56ee03609f0536f8f7 (diff)
downloadmeson-59984f501412cb2c8b8643a6b5ee4933c891d99e.zip
meson-59984f501412cb2c8b8643a6b5ee4933c891d99e.tar.gz
meson-59984f501412cb2c8b8643a6b5ee4933c891d99e.tar.bz2
do not skip test case 113 on Windows
-rw-r--r--test cases/common/113 generatorcustom/meson.build27
1 files changed, 12 insertions, 15 deletions
diff --git a/test cases/common/113 generatorcustom/meson.build b/test cases/common/113 generatorcustom/meson.build
index 472d565..17d27e5 100644
--- a/test cases/common/113 generatorcustom/meson.build
+++ b/test cases/common/113 generatorcustom/meson.build
@@ -1,21 +1,18 @@
project('generatorcustom', 'c')
-if meson.get_compiler('c').get_id() != 'msvc'
- creator = find_program('gen.py')
- catter = find_program('catter.py')
+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