chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 53ac5a6)
documentation/doxygen: properly adapt all tests to graphviz 10.
authorVladimír Vondruš <mosra@centrum.cz>
Fri, 13 Sep 2024 22:28:15 +0000 (00:28 +0200)
committerVladimír Vondruš <mosra@centrum.cz>
Sat, 14 Sep 2024 00:46:33 +0000 (02:46 +0200)
Forgot this in 182939f4d403c42c061b6d37907fab2286b6da24.

documentation/test_doxygen/contents_custom/dot-2.html [new file with mode: 0644] patch | blob
documentation/test_doxygen/contents_custom/dot.html patch | blob | history
documentation/test_doxygen/test_contents.py patch | blob | history

diff --git a/documentation/test_doxygen/contents_custom/dot-2.html b/documentation/test_doxygen/contents_custom/dot-2.html
new file mode 100644 (file)
index 0000000..153e4eb
--- /dev/null
+++ b/documentation/test_doxygen/contents_custom/dot-2.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>Dot | My Project</title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" />
+  <link rel="stylesheet" href="m-dark+documentation.compiled.css" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+</head>
+<body>
+<header><nav id="navigation">
+  <div class="m-container">
+    <div class="m-row">
+      <a href="index.html" id="m-navbar-brand" class="m-col-t-8 m-col-m-none m-left-m">My Project</a>
+    </div>
+  </div>
+</nav></header>
+<main><article>
+  <div class="m-container m-container-inflatable">
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        <h1>
+          Dot
+        </h1>
+<p>A red graph:</p><div class="m-graph m-danger"><svg style="width: 3.875rem; height: 7.375rem;" viewBox="0.00 0.00 62.00 117.54">
+<g transform="scale(1 1) rotate(0) translate(4 113.54)">
+<g class="m-node m-flat">
+<title>a</title>
+<ellipse cx="27" cy="-91.15" rx="27" ry="18.27"/>
+<text text-anchor="middle" x="27" y="-87.35">a</text>
+</g>
+<g class="m-node m-flat">
+<title>b</title>
+<ellipse cx="27" cy="-18.38" rx="27" ry="18.27"/>
+<text text-anchor="middle" x="27" y="-14.58">b</text>
+</g>
+<g class="m-edge">
+<title>a&#45;&#45;b</title>
+<path d="M27,-72.66C27,-61.85 27,-48.03 27,-37.17"/>
+</g>
+</g>
+</svg>
+</div><p>A blue graph, from a file:</p><div class="m-graph m-info"><svg style="width: 3.875rem; height: 7.375rem;" viewBox="0.00 0.00 62.00 117.54">
+<g transform="scale(1 1) rotate(0) translate(4 113.54)">
+<g class="m-node m-flat">
+<title>a</title>
+<ellipse cx="27" cy="-91.15" rx="27" ry="18.27"/>
+<text text-anchor="middle" x="27" y="-87.35">a</text>
+</g>
+<g class="m-node m-flat">
+<title>b</title>
+<ellipse cx="27" cy="-18.38" rx="27" ry="18.27"/>
+<text text-anchor="middle" x="27" y="-14.58">b</text>
+</g>
+<g class="m-edge">
+<title>a&#45;&#45;b</title>
+<path d="M27,-72.66C27,-61.85 27,-48.03 27,-37.17"/>
+</g>
+</g>
+</svg>
+</div>
+      </div>
+    </div>
+  </div>
+</article></main>
+</body>
+</html>
diff --git a/documentation/test_doxygen/contents_custom/dot.html b/documentation/test_doxygen/contents_custom/dot.html
index 153e4ebf88f1e6a0bf9a102febe4380d42e86bbe..ba37aa949dae9f97e25bb30334d50430e057d150 100644 (file)
--- a/documentation/test_doxygen/contents_custom/dot.html
+++ b/documentation/test_doxygen/contents_custom/dot.html
@@ -22,39 +22,39 @@
         <h1>
           Dot
         </h1>
-<p>A red graph:</p><div class="m-graph m-danger"><svg style="width: 3.875rem; height: 7.375rem;" viewBox="0.00 0.00 62.00 117.54">
-<g transform="scale(1 1) rotate(0) translate(4 113.54)">
+<p>A red graph:</p><div class="m-graph m-danger"><svg style="width: 3.875rem; height: 8.125rem;" viewBox="0.00 0.00 62.00 130.27">
+<g transform="scale(1 1) rotate(0) translate(4 126.27)">
 <g class="m-node m-flat">
 <title>a</title>
-<ellipse cx="27" cy="-91.15" rx="27" ry="18.27"/>
-<text text-anchor="middle" x="27" y="-87.35">a</text>
+<ellipse cx="27" cy="-100.7" rx="27" ry="21.57"/>
+<text text-anchor="middle" x="27" y="-96.75">a</text>
 </g>
 <g class="m-node m-flat">
 <title>b</title>
-<ellipse cx="27" cy="-18.38" rx="27" ry="18.27"/>
-<text text-anchor="middle" x="27" y="-14.58">b</text>
+<ellipse cx="27" cy="-21.57" rx="27" ry="21.57"/>
+<text text-anchor="middle" x="27" y="-17.62">b</text>
 </g>
 <g class="m-edge">
 <title>a&#45;&#45;b</title>
-<path d="M27,-72.66C27,-61.85 27,-48.03 27,-37.17"/>
+<path d="M27,-79.03C27,-68.05 27,-54.59 27,-43.56"/>
 </g>
 </g>
 </svg>
-</div><p>A blue graph, from a file:</p><div class="m-graph m-info"><svg style="width: 3.875rem; height: 7.375rem;" viewBox="0.00 0.00 62.00 117.54">
-<g transform="scale(1 1) rotate(0) translate(4 113.54)">
+</div><p>A blue graph, from a file:</p><div class="m-graph m-info"><svg style="width: 3.875rem; height: 8.125rem;" viewBox="0.00 0.00 62.00 130.27">
+<g transform="scale(1 1) rotate(0) translate(4 126.27)">
 <g class="m-node m-flat">
 <title>a</title>
-<ellipse cx="27" cy="-91.15" rx="27" ry="18.27"/>
-<text text-anchor="middle" x="27" y="-87.35">a</text>
+<ellipse cx="27" cy="-100.7" rx="27" ry="21.57"/>
+<text text-anchor="middle" x="27" y="-96.75">a</text>
 </g>
 <g class="m-node m-flat">
 <title>b</title>
-<ellipse cx="27" cy="-18.38" rx="27" ry="18.27"/>
-<text text-anchor="middle" x="27" y="-14.58">b</text>
+<ellipse cx="27" cy="-21.57" rx="27" ry="21.57"/>
+<text text-anchor="middle" x="27" y="-17.62">b</text>
 </g>
 <g class="m-edge">
 <title>a&#45;&#45;b</title>
-<path d="M27,-72.66C27,-61.85 27,-48.03 27,-37.17"/>
+<path d="M27,-79.03C27,-68.05 27,-54.59 27,-43.56"/>
 </g>
 </g>
 </svg>
diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py
index 790a654a3cfebcbcf3e9fc3f8a8e70224286e130..cf9e72754219f48af4c8bc6bce3380f5fdbd8abf 100644 (file)
--- a/documentation/test_doxygen/test_contents.py
+++ b/documentation/test_doxygen/test_contents.py
@@ -281,9 +281,13 @@ class Custom(IntegrationTestCase):
     def test_dot(self):
         self.run_doxygen(wildcard='dot.xml')
 
-        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
-        if parse_version(dot_version()) >= parse_version("2.42.2"):
+        # The damn thing adopted Chrome versioning apparently. No idea if the
+        # output changed in version 7, 8 or 9 already.
+        if parse_version(dot_version()) >= parse_version("10.0"):
             file = 'dot.html'
+        # Used to be >= 2.44.0, but 2.42.2 appears to have the same output
+        elif parse_version(dot_version()) >= parse_version("2.42.2"):
+            file = 'dot-2.html'
         else:
             file = 'dot-240.html'
 
Colin Watson's blog