Disable failing cmake jobs on VS2017

These only fail when building with msvc/clang-cl on the VS2017-Win2016 image. See: mesonbuild#7307
nirbheek · Jun 14, 2020 · e121942 · e121942
1 parent 6c56478
commit e121942
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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')