From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 14 Sep 2024 17:05:55 +0000 (+0200)
Subject: documentation/doxygen: use a correct condition in the test.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=f9089d2e8e6a04d3e8114cde174a5375ea3e0c65;p=blog.git

documentation/doxygen: use a correct condition in the test.

It's broken like that in 1.9.7 already. That's what I get for pushing
09ddeebf4e77b8912bd8c914c5f75b25dd79d8a1 to master at 4 AM.
---

diff --git a/documentation/test_doxygen/test_compound.py b/documentation/test_doxygen/test_compound.py
index e945aea6..622c63a4 100644
--- a/documentation/test_doxygen/test_compound.py
+++ b/documentation/test_doxygen/test_compound.py
@@ -163,7 +163,7 @@ class ModulesInNamespace(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceNamespace.html', 'namespaceNamespace-stupid.html'))
             self.assertEqual(*self.actual_expected_contents('file3_8h.html', 'file3_8h-stupid.html'))
         else:
@@ -262,7 +262,7 @@ class Includes(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html', 'namespaceContained-stupid.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html'))
@@ -289,7 +289,7 @@ class IncludesDisabled(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html', 'namespaceContained-stupid.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html'))
@@ -310,7 +310,7 @@ class IncludesUndocumentedFiles(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html', '../compound_includes_disabled/namespaceContained-stupid.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('namespaceContained.html', '../compound_includes_disabled/namespaceContained.html'))
diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py
index a55a58a6..b661a89f 100644
--- a/documentation/test_doxygen/test_contents.py
+++ b/documentation/test_doxygen/test_contents.py
@@ -448,7 +448,7 @@ class AnchorInBothGroupAndNamespace(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceFoo.html', 'namespaceFoo-stupid.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('namespaceFoo.html'))
diff --git a/documentation/test_doxygen/test_undocumented.py b/documentation/test_doxygen/test_undocumented.py
index b4d83a42..78734e3e 100644
--- a/documentation/test_doxygen/test_undocumented.py
+++ b/documentation/test_doxygen/test_undocumented.py
@@ -48,7 +48,7 @@ class Undocumented(IntegrationTestCase):
         # stupid because the XML is no longer self-contained. I refuse to
         # implement parsing of nested XMLs, so the output will lack some
         # members if groups are used.
-        if parse_version(doxygen_version()) > parse_version("1.9.7"):
+        if parse_version(doxygen_version()) >= parse_version("1.9.7"):
             self.assertEqual(*self.actual_expected_contents('namespaceNamespace.html', 'namespaceNamespace-stupid.html'))
             self.assertEqual(*self.actual_expected_contents('File_8h.html', 'File_8h-stupid.html'))
         else:
@@ -67,7 +67,7 @@ class Undocumented(IntegrationTestCase):
 
             # See above, it's because certain symbols got skipped due to
             # stupidity
-            if parse_version(doxygen_version()) > parse_version("1.9.7"):
+            if parse_version(doxygen_version()) >= parse_version("1.9.7"):
                 self.assertEqual(symbol_count, 28)
             else:
                 self.assertEqual(symbol_count, 44)