From 9111dd64fecd93d4f4398aeaf3d93bed3365bb5c Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Fri, 31 Jan 2025 13:35:27 -0300 Subject: [PATCH 1/6] test: default source-root is subdir --- src/test/TestRunner.cpp | 10 ++++++---- test-files/golden-tests/core/mrdocs.yml | 1 - test-files/golden-tests/filters/file/mrdocs.yml | 1 - .../golden-tests/filters/symbol-name/mrdocs.yml | 1 - .../golden-tests/filters/symbol-type/mrdocs.yml | 1 - test-files/golden-tests/javadoc/mrdocs.yml | 4 ---- test-files/golden-tests/output/mrdocs.yml | 4 ---- .../golden-tests/templates/c_mct_expl_inline.adoc | 10 +++++----- .../golden-tests/templates/c_mct_expl_inline.html | 10 +++++----- .../golden-tests/templates/c_mct_expl_inline.xml | 10 +++++----- .../golden-tests/templates/c_mct_expl_outside.adoc | 10 +++++----- .../golden-tests/templates/c_mct_expl_outside.html | 10 +++++----- .../golden-tests/templates/c_mct_expl_outside.xml | 10 +++++----- .../golden-tests/templates/c_mft_expl_inline.adoc | 8 ++++---- .../golden-tests/templates/c_mft_expl_inline.html | 8 ++++---- .../golden-tests/templates/c_mft_expl_inline.xml | 6 +++--- .../golden-tests/templates/c_mft_expl_outside.adoc | 8 ++++---- .../golden-tests/templates/c_mft_expl_outside.html | 8 ++++---- .../golden-tests/templates/c_mft_expl_outside.xml | 6 +++--- test-files/golden-tests/templates/ct_expl.adoc | 8 ++++---- test-files/golden-tests/templates/ct_expl.html | 8 ++++---- test-files/golden-tests/templates/ct_expl.xml | 8 ++++---- test-files/golden-tests/templates/ct_mc.adoc | 6 +++--- test-files/golden-tests/templates/ct_mc.html | 6 +++--- test-files/golden-tests/templates/ct_mc.xml | 6 +++--- .../golden-tests/templates/ct_mc_expl_outside.adoc | 12 ++++++------ .../golden-tests/templates/ct_mc_expl_outside.html | 12 ++++++------ .../golden-tests/templates/ct_mc_expl_outside.xml | 14 +++++++------- test-files/golden-tests/templates/ct_mct.adoc | 6 +++--- test-files/golden-tests/templates/ct_mct.html | 6 +++--- test-files/golden-tests/templates/ct_mct.xml | 6 +++--- .../golden-tests/templates/ct_mct_expl_inline.adoc | 10 +++++----- .../golden-tests/templates/ct_mct_expl_inline.html | 10 +++++----- .../golden-tests/templates/ct_mct_expl_inline.xml | 10 +++++----- .../templates/ct_mct_expl_outside.adoc | 14 +++++++------- .../templates/ct_mct_expl_outside.html | 14 +++++++------- .../golden-tests/templates/ct_mct_expl_outside.xml | 14 +++++++------- test-files/golden-tests/templates/ct_mf.adoc | 4 ++-- test-files/golden-tests/templates/ct_mf.html | 4 ++-- test-files/golden-tests/templates/ct_mf.xml | 4 ++-- .../golden-tests/templates/ct_mf_expl_outside.adoc | 8 ++++---- .../golden-tests/templates/ct_mf_expl_outside.html | 8 ++++---- .../golden-tests/templates/ct_mf_expl_outside.xml | 10 +++++----- test-files/golden-tests/templates/ct_mft.adoc | 4 ++-- test-files/golden-tests/templates/ct_mft.html | 4 ++-- test-files/golden-tests/templates/ct_mft.xml | 4 ++-- .../golden-tests/templates/ct_mft_expl_inline.adoc | 8 ++++---- .../golden-tests/templates/ct_mft_expl_inline.html | 8 ++++---- .../golden-tests/templates/ct_mft_expl_inline.xml | 6 +++--- .../templates/ct_mft_expl_outside.adoc | 12 ++++++------ .../templates/ct_mft_expl_outside.html | 12 ++++++------ .../golden-tests/templates/ct_mft_expl_outside.xml | 10 +++++----- test-files/golden-tests/templates/ft_expl.adoc | 6 +++--- test-files/golden-tests/templates/ft_expl.html | 6 +++--- test-files/golden-tests/templates/ft_expl.xml | 4 ++-- 55 files changed, 204 insertions(+), 214 deletions(-) delete mode 100644 test-files/golden-tests/core/mrdocs.yml delete mode 100644 test-files/golden-tests/filters/file/mrdocs.yml delete mode 100644 test-files/golden-tests/filters/symbol-name/mrdocs.yml delete mode 100644 test-files/golden-tests/filters/symbol-type/mrdocs.yml delete mode 100644 test-files/golden-tests/javadoc/mrdocs.yml delete mode 100644 test-files/golden-tests/output/mrdocs.yml diff --git a/src/test/TestRunner.cpp b/src/test/TestRunner.cpp index de9812bb9b..ac07ac9648 100644 --- a/src/test/TestRunner.cpp +++ b/src/test/TestRunner.cpp @@ -277,8 +277,10 @@ handleDir( entry.type() == fs::file_type::directory_file) { // Check for a subdirectory-wide config + auto const& subdir = entry.path(); Config::Settings subdirSettings = dirSettings; - std::string const& configPath = files::appendPath(entry.path(), "mrdocs.yml"); + subdirSettings.sourceRoot = subdir; + std::string const& configPath = files::appendPath(subdir, "mrdocs.yml"); if (files::exists(configPath)) { if (auto exp = Config::Settings::load_file(subdirSettings, configPath, dirs_); !exp) @@ -290,7 +292,7 @@ handleDir( return report::error("Failed to normalize config file: {}: \"{}\"", exp.error(), configPath); } } - handleDir(entry.path(), subdirSettings); + handleDir(subdir, subdirSettings); } else if( entry.type() == fs::file_type::regular_file && @@ -337,9 +339,9 @@ checkPath( Config::Settings dirSettings; testArgs.apply(dirSettings, dirs_, argv); dirSettings.multipage = false; - dirSettings.sourceRoot = files::appendPath(inputPath, "."); - + dirSettings.sourceRoot = inputDir; std::string const& configPath = files::appendPath(inputDir, "mrdocs.yml"); + if (files::exists(configPath)) { if (auto exp = Config::Settings::load_file(dirSettings, configPath, dirs_); !exp) diff --git a/test-files/golden-tests/core/mrdocs.yml b/test-files/golden-tests/core/mrdocs.yml deleted file mode 100644 index 63cf197efb..0000000000 --- a/test-files/golden-tests/core/mrdocs.yml +++ /dev/null @@ -1 +0,0 @@ -source-root: . \ No newline at end of file diff --git a/test-files/golden-tests/filters/file/mrdocs.yml b/test-files/golden-tests/filters/file/mrdocs.yml deleted file mode 100644 index 63cf197efb..0000000000 --- a/test-files/golden-tests/filters/file/mrdocs.yml +++ /dev/null @@ -1 +0,0 @@ -source-root: . \ No newline at end of file diff --git a/test-files/golden-tests/filters/symbol-name/mrdocs.yml b/test-files/golden-tests/filters/symbol-name/mrdocs.yml deleted file mode 100644 index 63cf197efb..0000000000 --- a/test-files/golden-tests/filters/symbol-name/mrdocs.yml +++ /dev/null @@ -1 +0,0 @@ -source-root: . \ No newline at end of file diff --git a/test-files/golden-tests/filters/symbol-type/mrdocs.yml b/test-files/golden-tests/filters/symbol-type/mrdocs.yml deleted file mode 100644 index 63cf197efb..0000000000 --- a/test-files/golden-tests/filters/symbol-type/mrdocs.yml +++ /dev/null @@ -1 +0,0 @@ -source-root: . \ No newline at end of file diff --git a/test-files/golden-tests/javadoc/mrdocs.yml b/test-files/golden-tests/javadoc/mrdocs.yml deleted file mode 100644 index eee2ef0cd9..0000000000 --- a/test-files/golden-tests/javadoc/mrdocs.yml +++ /dev/null @@ -1,4 +0,0 @@ -#ignore-failures: true -concurrency: 1 -source-root: . -single-page: true diff --git a/test-files/golden-tests/output/mrdocs.yml b/test-files/golden-tests/output/mrdocs.yml deleted file mode 100644 index eee2ef0cd9..0000000000 --- a/test-files/golden-tests/output/mrdocs.yml +++ /dev/null @@ -1,4 +0,0 @@ -#ignore-failures: true -concurrency: 1 -source-root: . -single-page: true diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.adoc b/test-files/golden-tests/templates/c_mct_expl_inline.adoc index 3f33ad6279..b8f5db6714 100644 --- a/test-files/golden-tests/templates/c_mct_expl_inline.adoc +++ b/test-files/golden-tests/templates/c_mct_expl_inline.adoc @@ -21,7 +21,7 @@ === Synopsis -Declared in `<templates/c_mct_expl_inline.cpp>` +Declared in `<c_mct_expl_inline.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- @@ -47,7 +47,7 @@ struct A; === Synopsis -Declared in `<templates/c_mct_expl_inline.cpp>` +Declared in `<c_mct_expl_inline.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- @@ -73,7 +73,7 @@ struct B; === Synopsis -Declared in `<templates/c_mct_expl_inline.cpp>` +Declared in `<c_mct_expl_inline.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- @@ -88,7 +88,7 @@ f(); === Synopsis -Declared in `<templates/c_mct_expl_inline.cpp>` +Declared in `<c_mct_expl_inline.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- @@ -114,7 +114,7 @@ struct <><int>; === Synopsis -Declared in `<templates/c_mct_expl_inline.cpp>` +Declared in `<c_mct_expl_inline.cpp>` [source,cpp,subs="verbatim,replacements,macros,-callouts"] ---- diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.html b/test-files/golden-tests/templates/c_mct_expl_inline.html index ce1f8e99b4..448c8524f6 100644 --- a/test-files/golden-tests/templates/c_mct_expl_inline.html +++ b/test-files/golden-tests/templates/c_mct_expl_inline.html @@ -29,7 +29,7 @@

A

Synopsis

-Declared in <templates/c_mct_expl_inline.cpp>
+Declared in <c_mct_expl_inline.cpp>
 
 struct A;
@@ -59,7 +59,7 @@ 
A::B

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_inline.cpp>

+Declared in <c_mct_expl_inline.cpp>

 
 
 template<typename T>
@@ -89,7 +89,7 @@ 
A::B::f

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_inline.cpp>

+Declared in <c_mct_expl_inline.cpp>

 
 
 void
@@ -105,7 +105,7 @@ 
A::B<int>

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_inline.cpp>

+Declared in <c_mct_expl_inline.cpp>

 
 
 template<>
@@ -135,7 +135,7 @@ 
A::B<int>::g

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_inline.cpp>

+Declared in <c_mct_expl_inline.cpp>

 
 
 void
diff --git a/test-files/golden-tests/templates/c_mct_expl_inline.xml b/test-files/golden-tests/templates/c_mct_expl_inline.xml
index 61c07c1534..fdd9a3b0fa 100644
--- a/test-files/golden-tests/templates/c_mct_expl_inline.xml
+++ b/test-files/golden-tests/templates/c_mct_expl_inline.xml
@@ -3,22 +3,22 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 
   
-    
+    
     
     
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.adoc b/test-files/golden-tests/templates/c_mct_expl_outside.adoc
index 01695a373a..2bb4fa8f8c 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.adoc
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.adoc
@@ -21,7 +21,7 @@
 === Synopsis
 
 
-Declared in `<templates/c_mct_expl_outside.cpp>`
+Declared in `<c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -47,7 +47,7 @@ struct A;
 === Synopsis
 
 
-Declared in `<templates/c_mct_expl_outside.cpp>`
+Declared in `<c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -73,7 +73,7 @@ struct B;
 === Synopsis
 
 
-Declared in `<templates/c_mct_expl_outside.cpp>`
+Declared in `<c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -88,7 +88,7 @@ f();
 === Synopsis
 
 
-Declared in `<templates/c_mct_expl_outside.cpp>`
+Declared in `<c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -114,7 +114,7 @@ struct <><int>;
 === Synopsis
 
 
-Declared in `<templates/c_mct_expl_outside.cpp>`
+Declared in `<c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.html b/test-files/golden-tests/templates/c_mct_expl_outside.html
index 9fdc29a51e..cc907925f0 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.html
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.html
@@ -29,7 +29,7 @@ 
A

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_outside.cpp>

+Declared in <c_mct_expl_outside.cpp>

 
 
 struct A;
@@ -59,7 +59,7 @@ 
A::B

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_outside.cpp>

+Declared in <c_mct_expl_outside.cpp>

 
 
 template<typename T>
@@ -89,7 +89,7 @@ 
A::B::f

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_outside.cpp>

+Declared in <c_mct_expl_outside.cpp>

 
 
 void
@@ -105,7 +105,7 @@ 
A::B<int>

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_outside.cpp>

+Declared in <c_mct_expl_outside.cpp>

 
 
 template<>
@@ -135,7 +135,7 @@ 
A::B<int>::g

 

 
Synopsis

 

-Declared in <templates/c_mct_expl_outside.cpp>

+Declared in <c_mct_expl_outside.cpp>

 
 
 void
diff --git a/test-files/golden-tests/templates/c_mct_expl_outside.xml b/test-files/golden-tests/templates/c_mct_expl_outside.xml
index dc96a4f0b5..6668007c33 100644
--- a/test-files/golden-tests/templates/c_mct_expl_outside.xml
+++ b/test-files/golden-tests/templates/c_mct_expl_outside.xml
@@ -3,22 +3,22 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 
   
-    
+    
     
     
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.adoc b/test-files/golden-tests/templates/c_mft_expl_inline.adoc
index 739e483adb..4431a8edbb 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.adoc
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.adoc
@@ -21,7 +21,7 @@
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_inline.cpp>`
+Declared in `<c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -46,7 +46,7 @@ struct A;
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_inline.cpp>`
+Declared in `<c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -73,7 +73,7 @@ void
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_inline.cpp>`
+Declared in `<c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ f();
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_inline.cpp>`
+Declared in `<c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.html b/test-files/golden-tests/templates/c_mft_expl_inline.html
index 380f53440f..51e1da398f 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.html
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.html
@@ -29,7 +29,7 @@ 
A

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_inline.cpp>

+Declared in <c_mft_expl_inline.cpp>

 
 
 struct A;
@@ -58,7 +58,7 @@ 
A::f

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_inline.cpp>

+Declared in <c_mft_expl_inline.cpp>

 
 
 template<typename T>
@@ -85,7 +85,7 @@ 
A::f

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_inline.cpp>

+Declared in <c_mft_expl_inline.cpp>

 
 
 template<typename T>
@@ -102,7 +102,7 @@ 
A::f<int>

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_inline.cpp>

+Declared in <c_mft_expl_inline.cpp>

 
 
 template<>
diff --git a/test-files/golden-tests/templates/c_mft_expl_inline.xml b/test-files/golden-tests/templates/c_mft_expl_inline.xml
index 693b4e15f3..d02c4ce52d 100644
--- a/test-files/golden-tests/templates/c_mft_expl_inline.xml
+++ b/test-files/golden-tests/templates/c_mft_expl_inline.xml
@@ -3,17 +3,17 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 
   
-    
+    
     
     
   
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.adoc b/test-files/golden-tests/templates/c_mft_expl_outside.adoc
index 2c8a0db122..055c4ce448 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.adoc
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.adoc
@@ -21,7 +21,7 @@
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_outside.cpp>`
+Declared in `<c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -46,7 +46,7 @@ struct A;
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_outside.cpp>`
+Declared in `<c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -73,7 +73,7 @@ void
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_outside.cpp>`
+Declared in `<c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ f();
 === Synopsis
 
 
-Declared in `<templates/c_mft_expl_outside.cpp>`
+Declared in `<c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.html b/test-files/golden-tests/templates/c_mft_expl_outside.html
index 62f9f68d61..6c628bb66c 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.html
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.html
@@ -29,7 +29,7 @@ 
A

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_outside.cpp>

+Declared in <c_mft_expl_outside.cpp>

 
 
 struct A;
@@ -58,7 +58,7 @@ 
A::f

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_outside.cpp>

+Declared in <c_mft_expl_outside.cpp>

 
 
 template<typename T>
@@ -85,7 +85,7 @@ 
A::f

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_outside.cpp>

+Declared in <c_mft_expl_outside.cpp>

 
 
 template<typename T>
@@ -102,7 +102,7 @@ 
A::f<int>

 

 
Synopsis

 

-Declared in <templates/c_mft_expl_outside.cpp>

+Declared in <c_mft_expl_outside.cpp>

 
 
 template<>
diff --git a/test-files/golden-tests/templates/c_mft_expl_outside.xml b/test-files/golden-tests/templates/c_mft_expl_outside.xml
index 9aeebbe7e2..c9ca426709 100644
--- a/test-files/golden-tests/templates/c_mft_expl_outside.xml
+++ b/test-files/golden-tests/templates/c_mft_expl_outside.xml
@@ -3,17 +3,17 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 
   
-    
+    
     
     
   
diff --git a/test-files/golden-tests/templates/ct_expl.adoc b/test-files/golden-tests/templates/ct_expl.adoc
index 05202366eb..3b1cf127c6 100644
--- a/test-files/golden-tests/templates/ct_expl.adoc
+++ b/test-files/golden-tests/templates/ct_expl.adoc
@@ -22,7 +22,7 @@
 === Synopsis
 
 
-Declared in `<templates/ct_expl.cpp>`
+Declared in `<ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -48,7 +48,7 @@ struct A;
 === Synopsis
 
 
-Declared in `<templates/ct_expl.cpp>`
+Declared in `<ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -63,7 +63,7 @@ f();
 === Synopsis
 
 
-Declared in `<templates/ct_expl.cpp>`
+Declared in `<ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ struct <><int>;
 === Synopsis
 
 
-Declared in `<templates/ct_expl.cpp>`
+Declared in `<ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/templates/ct_expl.html b/test-files/golden-tests/templates/ct_expl.html
index dfbe2a97e6..17ae8bdd7b 100644
--- a/test-files/golden-tests/templates/ct_expl.html
+++ b/test-files/golden-tests/templates/ct_expl.html
@@ -30,7 +30,7 @@ 
A

 

 
Synopsis

 

-Declared in <templates/ct_expl.cpp>

+Declared in <ct_expl.cpp>

 
 
 template<typename T>
@@ -60,7 +60,7 @@ 
A::f

 

 
Synopsis

 

-Declared in <templates/ct_expl.cpp>

+Declared in <ct_expl.cpp>

 
 
 void
@@ -76,7 +76,7 @@ 
A<int>

 

 
Synopsis

 

-Declared in <templates/ct_expl.cpp>

+Declared in <ct_expl.cpp>

 
 
 template<>
@@ -106,7 +106,7 @@ 
A<int>::g

 

 
Synopsis

 

-Declared in <templates/ct_expl.cpp>

+Declared in <ct_expl.cpp>

 
 
 void
diff --git a/test-files/golden-tests/templates/ct_expl.xml b/test-files/golden-tests/templates/ct_expl.xml
index e1beaab4d6..c9160d07d9 100644
--- a/test-files/golden-tests/templates/ct_expl.xml
+++ b/test-files/golden-tests/templates/ct_expl.xml
@@ -5,18 +5,18 @@
   
   
diff --git a/test-files/golden-tests/templates/ct_mc.adoc b/test-files/golden-tests/templates/ct_mc.adoc
index 1f7ec54c87..c8260af2b6 100644
--- a/test-files/golden-tests/templates/ct_mc.adoc
+++ b/test-files/golden-tests/templates/ct_mc.adoc
@@ -21,7 +21,7 @@
 === Synopsis
 
 
-Declared in `<templates/ct_mc.cpp>`
+Declared in `<ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -47,7 +47,7 @@ struct A;
 === Synopsis
 
 
-Declared in `<templates/ct_mc.cpp>`
+Declared in `<ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
@@ -72,7 +72,7 @@ struct B;
 === Synopsis
 
 
-Declared in `<templates/ct_mc.cpp>`
+Declared in `<ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/templates/ct_mc.html b/test-files/golden-tests/templates/ct_mc.html
index b260ffb8cd..850897edc8 100644
--- a/test-files/golden-tests/templates/ct_mc.html
+++ b/test-files/golden-tests/templates/ct_mc.html
@@ -29,7 +29,7 @@ 
A

 

 
Synopsis

 

-Declared in <templates/ct_mc.cpp>

+Declared in <ct_mc.cpp>

 
 
 template<typename T>
@@ -59,7 +59,7 @@ 
A::B

 

 
Synopsis

 

-Declared in <templates/ct_mc.cpp>

+Declared in <ct_mc.cpp>

 
 
 struct B;
@@ -88,7 +88,7 @@ 
A::B::f

 

 
Synopsis

 

-Declared in <templates/ct_mc.cpp>

+Declared in <ct_mc.cpp>

 
 
 void
diff --git a/test-files/golden-tests/templates/ct_mc.xml b/test-files/golden-tests/templates/ct_mc.xml
index 856f6d2db1..3db4604ff5 100644
--- a/test-files/golden-tests/templates/ct_mc.xml
+++ b/test-files/golden-tests/templates/ct_mc.xml
@@ -5,11 +5,11 @@