From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Tue, 15 Sep 2020 13:21:43 +0000 (+0200)
Subject: Add skip of PNG diff for also for Linux CMake rtest
X-Git-Tag: 2.46.0~20^2^2~68^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e40c48763784a58cf500528d5e0b682b71cc26a;p=graphviz

Add skip of PNG diff for also for Linux CMake rtest
---

diff --git a/rtest/rtest.py b/rtest/rtest.py
index 5a2af4947..3b50a12a4 100755
--- a/rtest/rtest.py
+++ b/rtest/rtest.py
@@ -145,10 +145,9 @@ def doDiff(OUTFILE, OUTDIR, REFDIR, testname, subtest_index, fmt):
     )
   elif F == 'png':
     # FIXME: remove when https://gitlab.com/graphviz/graphviz/-/issues/1788 is fixed
-    if platform.system() == 'Windows' and \
-       os.environ.get('build_system') == 'cmake':
+    if os.environ.get('build_system') == 'cmake':
       print('Warning: Skipping PNG image comparison for test {0}:{1} : format: '
-            '{2} because Windows CMake builds does not contain the diffimg '
+            '{2} because CMake builds does not contain the diffimg '
             'utility (#1788)'
             .format(testname, subtest_index, fmt),
             file=sys.stderr)
@@ -395,8 +394,7 @@ if not GENERATE:
     print('Could not find a value for DIFFIMG', file=sys.stderr)
     # FIXME: Remove workaround for missing diffimg when
     # https://gitlab.com/graphviz/graphviz/-/issues/1788 is fixed
-    if platform.system() != 'Windows' or \
-       os.environ.get('build_system') != 'cmake':
+    if os.environ.get('build_system') != 'cmake':
       sys.exit(1)
 #    sys.exit(1)