Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
timotheecour committed May 23, 2020
1 parent 1e6c7d0 commit f1e53ba
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 1 addition & 2 deletions compiler/nimpaths.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions nimdoc/test_out_index_dot_html/expected/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 4 additions & 1 deletion nimdoc/testproject/expected/subdir/subdir_b/utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions nimdoc/testproject/expected/testproject.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit f1e53ba

Please sign in to comment.