]> granicus.if.org Git - graphviz/commitdiff
Add skip of PNG diff for also for Linux CMake rtest
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Tue, 15 Sep 2020 13:21:43 +0000 (15:21 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Wed, 23 Sep 2020 06:37:52 +0000 (08:37 +0200)
rtest/rtest.py

index 5a2af49473ea9f00d78e82c338bebf530d8c4001..3b50a12a46601c397a259bda9e9d081b99e1b178 100755 (executable)
@@ -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)