From 614e5a55ea9df7a8de64e622b6b74f191104a9cb Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 9 Feb 2022 22:50:23 +1100
Subject: [PATCH] move #1786 test case into CI-only tests

In retrospect, this test case does not make sense in the regular test suite. It
is validating a particular plugin feature is enabled. It is perfectly valid to
build a version of Graphviz without png:gd support, yet it will fail this test
case.
---
 ci/tests.py              | 14 ++++++++++++++
 rtest/test_regression.py | 10 ----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ci/tests.py b/ci/tests.py
index d1c21000e..cd6626b99 100644
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -7,8 +7,12 @@ test cases that are only relevant to run in CI
 import os
 import platform
 import shutil
+import sys
 import pytest
 
+sys.path.append(os.path.join(os.path.dirname(__file__), "../rtest"))
+from gvtest import dot #pylint: disable=C0413
+
 @pytest.mark.parametrize("binary", [
   "acyclic",
   "bcomps",
@@ -138,3 +142,13 @@ def check_that_tool_does_not_exist(tool, os_id):
   """
   assert shutil.which(tool) is None, f"{tool} has been resurrected in the " \
     f'{os.getenv("build_system")} build on {os_id}. Please remove skip.'
+
+@pytest.mark.xfail(strict=os.getenv("build_system") == "cmake") # FIXME
+def test_1786():
+  """
+  png:gd format should be supported
+  https://gitlab.com/graphviz/graphviz/-/issues/1786
+  """
+
+  # run a trivial graph through Graphviz
+  dot("png:gd", source="digraph { a -> b; }")
diff --git a/rtest/test_regression.py b/rtest/test_regression.py
index 01128fa9f..f85396fca 100644
--- a/rtest/test_regression.py
+++ b/rtest/test_regression.py
@@ -627,16 +627,6 @@ def test_1783():
 
   assert ret != -signal.SIGSEGV, "Graphviz segfaulted"
 
-@pytest.mark.xfail(strict=os.getenv("build_system") == "cmake") # FIXME
-def test_1786():
-  """
-  png:gd format should be supported
-  https://gitlab.com/graphviz/graphviz/-/issues/1786
-  """
-
-  # run a trivial graph through Graphviz
-  dot("png:gd", source="digraph { a -> b; }")
-
 @pytest.mark.skipif(shutil.which("gvedit") is None, reason="Gvedit not available")
 def test_1813():
   """
-- 
2.40.0