From 228c9b8a972a512d033ca28085d0646572878154 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 10 Jan 2022 21:25:10 +0100
Subject: [PATCH] documentation/doxygen: the xrefim order change was just
 "temporary".

Followup to 4ec09a2c97f60c2c673de337d7dabdc198592f4a. A temporary
regression from 1.8.18 to 1.8.20, 1.9.0 is back to what 1.8.17 had. Heh.
Heh.
---
 documentation/test_doxygen/contents_blocks/old.html       | 2 +-
 .../contents_blocks/{old_1817.html => old_1818.html}      | 2 +-
 documentation/test_doxygen/test_contents.py               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename documentation/test_doxygen/contents_blocks/{old_1817.html => old_1818.html} (66%)

diff --git a/documentation/test_doxygen/contents_blocks/old.html b/documentation/test_doxygen/contents_blocks/old.html
index acb3c1c0..13f01f80 100644
--- a/documentation/test_doxygen/contents_blocks/old.html
+++ b/documentation/test_doxygen/contents_blocks/old.html
@@ -22,7 +22,7 @@
         <h1>
           Just old
         </h1>
-<dl class="m-doc"><dt>page <a href="index.html" class="m-doc">Main Page</a></dt><dd><p><a name="_old000001"></a> This is old.</p><p><a name="_old000002"></a> This is not merged.</p><p><a name="_old000003"></a> With this. Only on the listing page.</p></dd><dt>Member <a href="File_8h.html#a14bcd2d544b22300bba3863251393e0f" class="m-doc">foo</a>  ()</dt><dd><p><a name="_old000004"></a> Xrefitem, gets merged</p><p>with this one by Doxygen itself.</p></dd></dl>
+<dl class="m-doc"><dt>Member <a href="File_8h.html#a14bcd2d544b22300bba3863251393e0f" class="m-doc">foo</a>  ()</dt><dd><p><a name="_old000004"></a> Xrefitem, gets merged</p><p>with this one by Doxygen itself.</p></dd><dt>page <a href="index.html" class="m-doc">Main Page</a></dt><dd><p><a name="_old000001"></a> This is old.</p><p><a name="_old000002"></a> This is not merged.</p><p><a name="_old000003"></a> With this. Only on the listing page.</p></dd></dl>
       </div>
     </div>
   </div>
diff --git a/documentation/test_doxygen/contents_blocks/old_1817.html b/documentation/test_doxygen/contents_blocks/old_1818.html
similarity index 66%
rename from documentation/test_doxygen/contents_blocks/old_1817.html
rename to documentation/test_doxygen/contents_blocks/old_1818.html
index 13f01f80..acb3c1c0 100644
--- a/documentation/test_doxygen/contents_blocks/old_1817.html
+++ b/documentation/test_doxygen/contents_blocks/old_1818.html
@@ -22,7 +22,7 @@
         <h1>
           Just old
         </h1>
-<dl class="m-doc"><dt>Member <a href="File_8h.html#a14bcd2d544b22300bba3863251393e0f" class="m-doc">foo</a>  ()</dt><dd><p><a name="_old000004"></a> Xrefitem, gets merged</p><p>with this one by Doxygen itself.</p></dd><dt>page <a href="index.html" class="m-doc">Main Page</a></dt><dd><p><a name="_old000001"></a> This is old.</p><p><a name="_old000002"></a> This is not merged.</p><p><a name="_old000003"></a> With this. Only on the listing page.</p></dd></dl>
+<dl class="m-doc"><dt>page <a href="index.html" class="m-doc">Main Page</a></dt><dd><p><a name="_old000001"></a> This is old.</p><p><a name="_old000002"></a> This is not merged.</p><p><a name="_old000003"></a> With this. Only on the listing page.</p></dd><dt>Member <a href="File_8h.html#a14bcd2d544b22300bba3863251393e0f" class="m-doc">foo</a>  ()</dt><dd><p><a name="_old000004"></a> Xrefitem, gets merged</p><p>with this one by Doxygen itself.</p></dd></dl>
       </div>
     </div>
   </div>
diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py
index debb41d7..5ac350f3 100644
--- a/documentation/test_doxygen/test_contents.py
+++ b/documentation/test_doxygen/test_contents.py
@@ -70,11 +70,11 @@ class Blocks(IntegrationTestCase):
         else:
             self.assertEqual(*self.actual_expected_contents('todo.html', 'todo_1814.html'))
 
-        # 1.8.18 has a different order, not sure why
-        if LooseVersion(doxygen_version()) >= LooseVersion("1.8.18"):
-            self.assertEqual(*self.actual_expected_contents('old.html'))
+        # 1.8.18 to 1.8.20 has a different order, not sure why
+        if LooseVersion(doxygen_version()) >= LooseVersion("1.8.18") and LooseVersion(doxygen_version()) < LooseVersion("1.9.0"):
+            self.assertEqual(*self.actual_expected_contents('old.html', 'old_1818.html'))
         elif LooseVersion(doxygen_version()) > LooseVersion("1.8.14"):
-            self.assertEqual(*self.actual_expected_contents('old.html', 'old_1817.html'))
+            self.assertEqual(*self.actual_expected_contents('old.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('old.html', 'old_1814.html'))
 
-- 
2.30.2