From 1ea56d2e08741d3c0fe9b08244976d62ffd5d3d8 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 24 Oct 2020 20:11:33 -0700 Subject: [PATCH] add MSBuild exemption list to CI tool check Related to #1851. --- ci/tests.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ci/tests.py b/ci/tests.py index d58c906d9..2f514aa8a 100644 --- a/ci/tests.py +++ b/ci/tests.py @@ -48,6 +48,24 @@ def test_existence(binary: str): 'vimdot', ] + tools_not_built_with_msbuild = [ + 'circo', + 'cluster', + 'dot2gxl', + 'dot_builtins', + 'fdp', + 'gv2gxl', + 'gvedit', + 'gvmap.sh', + 'gxl2dot', + 'neato', + 'osage', + 'patchwork', + 'sfdp', + 'twopi', + 'vimdot', + ] + os_id = os.getenv('OS_ID') # FIXME: Remove skip when @@ -76,6 +94,13 @@ def test_existence(binary: str): check_that_tool_does_not_exist(binary, os_id) pytest.skip(binary + ' is not built with CMake (#1753 & #1836)') + # FIXME: Remove skip when + # https://gitlab.com/graphviz/graphviz/-/issues/1837 is fixed + if os.getenv('build_system') == 'msbuild': + if binary in tools_not_built_with_msbuild: + check_that_tool_does_not_exist(binary, os_id) + pytest.skip(binary + ' is not built with MSBuild (#1837)') + assert shutil.which(binary) is not None def check_that_tool_does_not_exist(tool, os_id): -- 2.40.0