From: Vladimír Vondruš Date: Sun, 9 Jan 2022 21:18:27 +0000 (+0100) Subject: documentation/doxygen: 1.8.16 doesn't support subpages of index. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=a6a8c872f989522f5253b3dee4b597df0e57d957;p=blog.git documentation/doxygen: 1.8.16 doesn't support subpages of index. These just aren't marked as such. So skip the direct test and rewrite the other to not accidentally use this functionality. --- diff --git a/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html b/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html index 75badd32..f5586a0d 100644 --- a/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html +++ b/documentation/test_doxygen/compound_filename_case/_u_p_p_e_r_c_a_s_e.html @@ -2,7 +2,7 @@ - My Project » Uppercase page | My Project + A page » Uppercase page | My Project @@ -20,7 +20,7 @@

- My Project » + A page » Uppercase page

This should get saved to a correct place and also get correctly linked to.

diff --git a/documentation/test_doxygen/compound_filename_case/input.h b/documentation/test_doxygen/compound_filename_case/input.h index 72a338b7..054f4ec8 100644 --- a/documentation/test_doxygen/compound_filename_case/input.h +++ b/documentation/test_doxygen/compound_filename_case/input.h @@ -1,4 +1,4 @@ -/** @mainpage +/** @page page A page - @subpage UPPERCASE - @ref UPPERCLASS diff --git a/documentation/test_doxygen/compound_filename_case/index.html b/documentation/test_doxygen/compound_filename_case/page.html similarity index 94% rename from documentation/test_doxygen/compound_filename_case/index.html rename to documentation/test_doxygen/compound_filename_case/page.html index 51cbd47b..0aafe775 100644 --- a/documentation/test_doxygen/compound_filename_case/index.html +++ b/documentation/test_doxygen/compound_filename_case/page.html @@ -2,7 +2,7 @@ - My Project + A page | My Project @@ -20,7 +20,7 @@

- My Project + A page

diff --git a/documentation/test_doxygen/compound_filename_case/pages.html b/documentation/test_doxygen/compound_filename_case/pages.html index 3d4f6ece..998c6b8f 100644 --- a/documentation/test_doxygen/compound_filename_case/pages.html +++ b/documentation/test_doxygen/compound_filename_case/pages.html @@ -22,7 +22,7 @@

Pages

  • - My Project + A page diff --git a/documentation/test_doxygen/test_compound.py b/documentation/test_doxygen/test_compound.py index d406c51a..a6e2e82f 100644 --- a/documentation/test_doxygen/test_compound.py +++ b/documentation/test_doxygen/test_compound.py @@ -207,7 +207,7 @@ class FilenameCase(IntegrationTestCase): # Verify that all filenames are "converted" to lowercase and the links # and page tree work properly as well - self.assertEqual(*self.actual_expected_contents('index.html')) + self.assertEqual(*self.actual_expected_contents('page.html')) self.assertEqual(*self.actual_expected_contents('pages.html')) self.assertEqual(*self.actual_expected_contents('_u_p_p_e_r_c_a_s_e.html')) self.assertEqual(*self.actual_expected_contents('class_u_p_p_e_r_c_l_a_s_s.html')) diff --git a/documentation/test_doxygen/test_page.py b/documentation/test_doxygen/test_page.py index 1768dbf9..23198011 100644 --- a/documentation/test_doxygen/test_page.py +++ b/documentation/test_doxygen/test_page.py @@ -74,6 +74,8 @@ class EmptyTitle(IntegrationTestCase): self.assertEqual(*self.actual_expected_contents('untitled.html')) class SubpageOfIndex(IntegrationTestCase): + @unittest.skipUnless(LooseVersion(doxygen_version()) >= LooseVersion("1.8.17"), + "1.8.16 and below doesn't mark the page as subpage of index") def test(self): self.run_doxygen(wildcard='*.xml') self.assertEqual(*self.actual_expected_contents('page.html'))