diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-14 03:45:23 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-14 12:32:48 +0530 |
| commit | 18a89f132ce2f7d1c4aff82f53fd5a8e928ac9b6 (patch) | |
| tree | aa4ea46729316631087e0cdbe425da658b9665ab | |
| parent | f542677fd4c6306de4fdf12629b755f5a9ae4bf9 (diff) | |
| download | meson-18a89f132ce2f7d1c4aff82f53fd5a8e928ac9b6.zip meson-18a89f132ce2f7d1c4aff82f53fd5a8e928ac9b6.tar.gz meson-18a89f132ce2f7d1c4aff82f53fd5a8e928ac9b6.tar.bz2 | |
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
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/meson.build | 7 | ||||
| -rw-r--r-- | test cases/cmake/5 object library/meson.build | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad0b6ae..84532c9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,6 +15,8 @@ jobs: - job: vs2017 pool: vmImage: VS2017-Win2016 + variables: + CI_JOB_VS2017: 1 strategy: matrix: 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') |