diff options
author | Timothee Cour <timothee.cour2@gmail.com> | 2020-05-25 04:25:40 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-25 13:25:40 +0200 |
commit | 58282547f6d3fe4ce3fa2efe4f6afe07bc5de662 (patch) | |
tree | 2ef8bc28fa8d78ea8bc18505c00d178a10537da4 /tests/nimdoc | |
parent | cbfe9325c5c1851630ce10cf780d1af27c57d19a (diff) | |
download | Nim-58282547f6d3fe4ce3fa2efe4f6afe07bc5de662.tar.gz |
fix #6583, fix #14376, index+search now generated for all projects, many bug fixes with nim doc (#14324)
* refs #6583 fix nim doc output * changelog * change default for outDir when unspecified * cleanups * --project implies --index
Diffstat (limited to 'tests/nimdoc')
-rw-r--r-- | tests/nimdoc/imp.nim | 1 | ||||
-rw-r--r-- | tests/nimdoc/m13129.nim | 4 | ||||
-rw-r--r-- | tests/nimdoc/sub/imp.nim | 1 | ||||
-rw-r--r-- | tests/nimdoc/sub/imp2.nim | 1 | ||||
-rw-r--r-- | tests/nimdoc/sub/mmain.nim | 8 |
5 files changed, 12 insertions, 3 deletions
diff --git a/tests/nimdoc/imp.nim b/tests/nimdoc/imp.nim new file mode 100644 index 000000000..ca08dcb35 --- /dev/null +++ b/tests/nimdoc/imp.nim @@ -0,0 +1 @@ +proc fn5*() = discard diff --git a/tests/nimdoc/m13129.nim b/tests/nimdoc/m13129.nim index 95d072d52..145cae39c 100644 --- a/tests/nimdoc/m13129.nim +++ b/tests/nimdoc/m13129.nim @@ -17,11 +17,9 @@ proc main*() = doAssert defined(m13129Foo2) doAssert not defined(nimdoc) echo "ok2: backend: " & querySetting(backend) - # echo defined(c), defined(js), import std/compilesettings when defined nimdoc: - # import std/compilesettings static: doAssert defined(m13129Foo1) doAssert not defined(m13129Foo2) @@ -33,6 +31,6 @@ when isMainModule: let cache = querySetting(nimcacheDir) doAssert cache.len > 0 let app = getAppFilename() - doAssert app.isRelativeTo(cache) + doAssert app.isRelativeTo(cache), $(app, cache) doAssert querySetting(projectFull) == currentSourcePath echo "ok3" diff --git a/tests/nimdoc/sub/imp.nim b/tests/nimdoc/sub/imp.nim new file mode 100644 index 000000000..d66542e45 --- /dev/null +++ b/tests/nimdoc/sub/imp.nim @@ -0,0 +1 @@ +proc fn4*() = discard diff --git a/tests/nimdoc/sub/imp2.nim b/tests/nimdoc/sub/imp2.nim new file mode 100644 index 000000000..60fa1e72d --- /dev/null +++ b/tests/nimdoc/sub/imp2.nim @@ -0,0 +1 @@ +proc fn3*() = discard diff --git a/tests/nimdoc/sub/mmain.nim b/tests/nimdoc/sub/mmain.nim new file mode 100644 index 000000000..42547b0b8 --- /dev/null +++ b/tests/nimdoc/sub/mmain.nim @@ -0,0 +1,8 @@ +{.warning[UnusedImport]: off.} + +import ../imp as impa +import imp as impb +import imp2 + +proc fn1*() = discard +proc fn2*() = discard |