From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Sat, 26 Sep 2020 08:09:00 +0000 (+0200)
Subject: Skip execution of all tools not built with MSBuild in tools test for MSBuild builds
X-Git-Tag: 2.46.0~20^2^2~55^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc3a51101e722bbeff56c32f7b6ecc028660c38c;p=graphviz

Skip execution of all tools not built with MSBuild in tools test for MSBuild builds

Fails because not all tools are built with MSBuild. See
https://gitlab.com/graphviz/graphviz/-/issues/1837.
---

diff --git a/rtest/test_tools.py b/rtest/test_tools.py
index c3ed37e3b..ce8e693dd 100644
--- a/rtest/test_tools.py
+++ b/rtest/test_tools.py
@@ -81,6 +81,24 @@ def test_tools(tool):
         '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
@@ -105,6 +123,12 @@ def test_tools(tool):
       if tool in tools_not_built_with_cmake:
         pytest.skip(tool + ' 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 tool in tools_not_built_with_msbuild:
+        pytest.skip(tool + ' is not built with MSBuild (#1837)')
+
     # FIXME: Remove skip when
     # https://gitlab.com/graphviz/graphviz/-/issues/1838 is fixed
     if tool == 'gvpack' and platform.system() != 'Windows':