fix tests

nim-lang · May 21, 2020 · 3d0b133 · 3d0b133
1 parent 3702840
commit 3d0b133
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/compiler/nimpaths.nim b/compiler/nimpaths.nim
@@ -33,8 +33,7 @@ proc interp*(path: string, nimr: string): string =
 
 proc getDocHacksJs*(nimr: string, nim = getCurrentCompilerExe(), forceRebuild = false): string =
   ## return absolute path to dochhack.js, rebuilding if it doesn't exist or if
-  ## `forceRebuild`; `nim` 
-  ## depending on caller (compiler or koch), nim = getAppFilename() may not
+  ## `forceRebuild`.
   let docHackJs2 = docHackJs.interp(nimr = nimr)
   if forceRebuild or not docHackJs2.fileExists:
     let cmd =  "$nim js $file" % ["nim", nim.quoteShell, "file", docHackNim.interp(nimr = nimr).quoteShell]

diff --git a/nimdoc/test_out_index_dot_html/expected/index.html b/nimdoc/test_out_index_dot_html/expected/index.html
@@ -83,6 +83,9 @@ <h1 class="title">foo</h1>
   </div>
   <div id="global-links">
     <ul class="simple">
+    <li>
+      <a href="theindex.html">Index</a>
+    </li>
     </ul>
   </div>
   <div id="searchInputDiv">

diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
@@ -20,7 +20,7 @@
 <title>subdir/subdir_b/utils</title>
 <link rel="stylesheet" type="text/css" href="../../nimdoc.out.css">
 
-<script type="text/javascript" src="dochack.js"></script>
+<script type="text/javascript" src="../../dochack.js"></script>
 
 <script type="text/javascript">
 function main() {
@@ -83,6 +83,9 @@ <h1 class="title">subdir/subdir_b/utils</h1>
   </div>
   <div id="global-links">
     <ul class="simple">
+    <li>
+      <a href="../../theindex.html">Index</a>
+    </li>
     </ul>
   </div>
   <div id="searchInputDiv">

diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html
@@ -83,6 +83,9 @@ <h1 class="title">testproject</h1>
   </div>
   <div id="global-links">
     <ul class="simple">
+    <li>
+      <a href="theindex.html">Index</a>
+    </li>
     </ul>
   </div>
   <div id="searchInputDiv">