]> granicus.if.org Git - graphviz/commitdiff
add CMake exemptions to CI tool check
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 25 Oct 2020 03:10:09 +0000 (20:10 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 25 Oct 2020 19:53:02 +0000 (12:53 -0700)
Related to #1851.

ci/tests.py

index 92aa5ff8a20ce601c874a098f4d5839d139c2263..d58c906d922d2d0e689305af3e948fb2639b711a 100644 (file)
@@ -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):