make tests on Windows green

This commit is contained in:
Araq
2017-01-31 23:05:36 +01:00
parent 5b32dafff4
commit 16260b23c7
2 changed files with 7 additions and 2 deletions

View File

@@ -7,6 +7,7 @@ nil
nil
'''
disabled: "windows"
"""
type

View File

@@ -110,8 +110,10 @@ proc dllTests(r: var TResults, cat: Category, options: string) =
runBasicDLLTest c, r, cat, options
runBasicDLLTest c, r, cat, options & " -d:release"
runBasicDLLTest c, r, cat, options & " --gc:boehm"
runBasicDLLTest c, r, cat, options & " -d:release --gc:boehm"
when not defined(windows):
# still cannot find a recent Windows version of boehm.dll:
runBasicDLLTest c, r, cat, options & " --gc:boehm"
runBasicDLLTest c, r, cat, options & " -d:release --gc:boehm"
# ------------------------------ GC tests -------------------------------------
@@ -271,6 +273,8 @@ proc findMainFile(dir: string): string =
proc manyLoc(r: var TResults, cat: Category, options: string) =
for kind, dir in os.walkDir("tests/manyloc"):
if kind == pcDir:
when defined(windows):
if dir.endsWith"nake": continue
let mainfile = findMainFile(dir)
if mainfile != "":
testNoSpec r, makeTest(mainfile, options, cat)