Skip to content

[TODO] fix for https://github.com/nim-lang/Nim/pull/13642 #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[TODO] fix for https://github.com/nim-lang/Nim/pull/13642 #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87e8b1c
fix for https://github.com/nim-lang/Nim/pull/13642
timotheecour Mar 15, 2020
7026118
fixup
timotheecour Mar 15, 2020
1bb9e25
support older nim
timotheecour Mar 15, 2020
9967c78
fixup
timotheecour Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/nimble.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,10 @@ proc test(options: Options) =
## Subdirectories are not walked.
var pkgInfo = getPkgInfo(getCurrentDir(), options)

let testsDir = getCurrentDir() / "tests"
var files: seq[typeof(walkDir(testsDir))]
if testsDir.existsDir: files = toSeq(walkDir(testsDir))
var
files = toSeq(walkDir(getCurrentDir() / "tests"))
tests, failures: int

if files.len < 1:
Expand Down
4 changes: 3 additions & 1 deletion src/nimblepkg/packageinfo.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ proc iterInstallFiles*(realDir: string, pkgInfo: PackageInfo,
iterFilesInDir(src, action)

iterFilesWithExt(realDir, pkgInfo, action)
else:
elif existsDir(realDir):
# check `existsDir` for things like:
# "C:\\Users\\foo\\.nimble\\pkgs\\chroma-0.1.0\\src
for kind, file in walkDir(realDir):
if kind == pcDir:
let skip = pkgInfo.checkInstallDir(realDir, file)
Expand Down