From: Matthew Fernandez Date: Sun, 25 Oct 2020 03:10:09 +0000 (-0700) Subject: add CMake exemptions to CI tool check X-Git-Tag: 2.46.0~20^2^2~11^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b17b0963bbaeb488b5975a116d01d77234cebe0;p=graphviz add CMake exemptions to CI tool check Related to #1851. --- diff --git a/ci/tests.py b/ci/tests.py index 92aa5ff8a..d58c906d9 100644 --- a/ci/tests.py +++ b/ci/tests.py @@ -19,6 +19,35 @@ def test_existence(binary: str): check that a given binary was built and is on $PATH ''' + tools_not_built_with_cmake = [ + 'circo', + 'cluster', + 'diffimg', + 'dot2gxl', + 'dot_builtins', + 'dotty', + 'edgepaint', + 'fdp', + 'gv2gml', + 'gv2gxl', + 'gvedit', + 'gvmap', + 'gvmap.sh', + 'gvpr', + 'gxl2dot', + 'lefty', + 'lneato', + 'mingle', + 'neato', + 'osage', + 'patchwork', + 'prune', + 'sfdp', + 'smyrna', + 'twopi', + 'vimdot', + ] + os_id = os.getenv('OS_ID') # FIXME: Remove skip when @@ -39,6 +68,14 @@ def test_existence(binary: str): check_that_tool_does_not_exist(binary, os_id) pytest.skip('smyrna is not built for Centos (#1834)') + # FIXME: Remove skip when + # https://gitlab.com/graphviz/graphviz/-/issues/1753 and + # https://gitlab.com/graphviz/graphviz/-/issues/1836 is fixed + if os.getenv('build_system') == 'cmake': + if binary in tools_not_built_with_cmake: + check_that_tool_does_not_exist(binary, os_id) + pytest.skip(binary + ' is not built with CMake (#1753 & #1836)') + assert shutil.which(binary) is not None def check_that_tool_does_not_exist(tool, os_id):