test: default source-root is subdir

Author: alandefreitas

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)

test-files/golden-tests/core/mrdocs.yml

@@ -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 <<A-B-04,B>>&lt;int&gt;;
 === Synopsis
 
 
-Declared in `&lt;templates&sol;c&lowbar;mct&lowbar;expl&lowbar;inline&period;cpp&gt;`
+Declared in `&lt;c&lowbar;mct&lowbar;expl&lowbar;inline&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----

test-files/golden-tests/filters/file/mrdocs.yml

@@ -29,7 +29,7 @@ <h2 id="A">A</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;templates/c_mct_expl_inline.cpp&gt;</code></div>
+Declared in <code>&lt;c_mct_expl_inline.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 struct A;
@@ -59,7 +59,7 @@ <h2 id="A-B-04"><a href="#A">A</a>::B</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;templates/c_mct_expl_inline.cpp&gt;</code></div>
+Declared in <code>&lt;c_mct_expl_inline.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 template&lt;typename T&gt;
@@ -89,7 +89,7 @@ <h2 id="A-B-04-f"><a href="#A">A</a>::<a href="#A-B-04">B</a>::f</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;templates/c_mct_expl_inline.cpp&gt;</code></div>
+Declared in <code>&lt;c_mct_expl_inline.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void
@@ -105,7 +105,7 @@ <h2 id="A-B-01"><a href="#A">A</a>::B&lt;int&gt;</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;templates/c_mct_expl_inline.cpp&gt;</code></div>
+Declared in <code>&lt;c_mct_expl_inline.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 template&lt;&gt;
@@ -135,7 +135,7 @@ <h2 id="A-B-01-g"><a href="#A">A</a>::<a href="#A-B-01">B</a>&lt;int&gt;::g</h2>
 <div>
 <h3>Synopsis</h3>
 <div>
-Declared in <code>&lt;templates/c_mct_expl_inline.cpp&gt;</code></div>
+Declared in <code>&lt;c_mct_expl_inline.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">
 void

test-files/golden-tests/filters/symbol-name/mrdocs.yml

@@ -3,22 +3,22 @@
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
   <struct name="A" id="YrPSaKAbmXgzCAX5WByx4eVoqBM=">
-    <file short-path="templates/c_mct_expl_inline.cpp" source-path="templates/c_mct_expl_inline.cpp" line="1" class="def"/>
+    <file short-path="c_mct_expl_inline.cpp" source-path="c_mct_expl_inline.cpp" line="1" class="def"/>
     <template>
       <tparam name="T" class="type"/>
       <struct name="B" id="TqGFMDXDQ6ddt946aVDeyhY9Ij8=">
-        <file short-path="templates/c_mct_expl_inline.cpp" source-path="templates/c_mct_expl_inline.cpp" line="3" class="def"/>
+        <file short-path="c_mct_expl_inline.cpp" source-path="c_mct_expl_inline.cpp" line="3" class="def"/>
         <function name="f" id="GOVvMTuIkLp/PqUkD5z7Bvf4+FQ=">
-          <file short-path="templates/c_mct_expl_inline.cpp" source-path="templates/c_mct_expl_inline.cpp" line="4" class="def"/>
+          <file short-path="c_mct_expl_inline.cpp" source-path="c_mct_expl_inline.cpp" line="4" class="def"/>
         </function>
       </struct>
     </template>
     <template class="explicit" id="TqGFMDXDQ6ddt946aVDeyhY9Ij8=">
       <targ class="type" type="int"/>
       <struct name="B" id="FxMFFVpoV2/LOOndnkQ2gu3w69U=">
-        <file short-path="templates/c_mct_expl_inline.cpp" source-path="templates/c_mct_expl_inline.cpp" line="7" class="def"/>
+        <file short-path="c_mct_expl_inline.cpp" source-path="c_mct_expl_inline.cpp" line="7" class="def"/>
         <function name="g" id="nxkAf/oNulEWX8A/IPUHkew79Y4=">
-          <file short-path="templates/c_mct_expl_inline.cpp" source-path="templates/c_mct_expl_inline.cpp" line="7" class="def"/>
+          <file short-path="c_mct_expl_inline.cpp" source-path="c_mct_expl_inline.cpp" line="7" class="def"/>
         </function>
       </struct>
     </template>