From e121942fcd1a5853618a5b9ba1bc01ed10acf4c4 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 14 Jun 2020 03:45:23 +0530 Subject: Disable failing cmake jobs on VS2017 These only fail when building with msvc/clang-cl on the VS2017-Win2016 image. See: https://github.com/mesonbuild/meson/issues/7307 --- test cases/cmake/2 advanced/meson.build | 7 +++++++ test cases/cmake/5 object library/meson.build | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'test cases/cmake') diff --git a/test cases/cmake/2 advanced/meson.build b/test cases/cmake/2 advanced/meson.build index a10db1c..4ebcd48 100644 --- a/test cases/cmake/2 advanced/meson.build +++ b/test cases/cmake/2 advanced/meson.build @@ -5,6 +5,13 @@ if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif +py3 = import('python').find_installation('python3') +get_envvar = '''import os, sys; print(os.environ.get('@0@', 0), end='')''' +# Remove this env var from azure-pipelines.yml when fixed +if run_command(py3, '-c', get_envvar.format('CI_JOB_VS2017')).stdout() == '1' + error('MESON_SKIP_TEST: broken for vs2017 jobs') +endif + cm = import('cmake') # Test the "normal" subproject call diff --git a/test cases/cmake/5 object library/meson.build b/test cases/cmake/5 object library/meson.build index f38a2dd..40b909b 100644 --- a/test cases/cmake/5 object library/meson.build +++ b/test cases/cmake/5 object library/meson.build @@ -5,6 +5,13 @@ if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif +py3 = import('python').find_installation('python3') +get_envvar = '''import os, sys; print(os.environ.get('@0@', 0), end='')''' +# Remove this env var from azure-pipelines.yml when fixed +if run_command(py3, '-c', get_envvar.format('CI_JOB_VS2017')).stdout() == '1' + error('MESON_SKIP_TEST: broken for vs2017 jobs') +endif + cm = import('cmake') sub_pro = cm.subproject('cmObjLib') -- cgit v1.1