make tests on Windows green under --pedantic

This commit is contained in:
Araq 2017-02-02 21:12:36 +01:00
commit e236039d10
4 changed files with 15 additions and 17 deletions

View file

@ -1,6 +1,6 @@
# discard """
# fsmonitor test disabled: windows
# """
import unittest import unittest
import fsmonitor import fsmonitor
@ -9,4 +9,3 @@ suite "fsmonitor":
test "should not raise OSError, bug# 3611": test "should not raise OSError, bug# 3611":
let m = newMonitor() let m = newMonitor()
m.add("foo", {MonitorCloseWrite, MonitorCloseNoWrite}) m.add("foo", {MonitorCloseWrite, MonitorCloseNoWrite})

View file

@ -284,9 +284,9 @@ proc compileExample(r: var TResults, pattern, options: string, cat: Category) =
testNoSpec r, makeTest(test, options, cat) testNoSpec r, makeTest(test, options, cat)
proc testStdlib(r: var TResults, pattern, options: string, cat: Category) = proc testStdlib(r: var TResults, pattern, options: string, cat: Category) =
var disabledSet = disabledFiles.toSet()
for test in os.walkFiles(pattern): for test in os.walkFiles(pattern):
if test notin disabledSet: let name = extractFilename(test)
if name notin disabledFiles:
let contents = readFile(test).string let contents = readFile(test).string
if contents.contains("when isMainModule"): if contents.contains("when isMainModule"):
testSpec r, makeTest(test, options, cat, actionRunNoSpec) testSpec r, makeTest(test, options, cat, actionRunNoSpec)

View file

@ -108,12 +108,6 @@ proc callCompiler(cmdTemplate, filename, options: string,
elif suc =~ pegSuccess: elif suc =~ pegSuccess:
result.err = reSuccess result.err = reSuccess
if result.err == reNimcCrash and
("Your platform is not supported" in result.msg or
"cannot open 'sdl'" in result.msg or
"cannot open 'opengl'" in result.msg):
result.err = reIgnored
proc callCCompiler(cmdTemplate, filename, options: string, proc callCCompiler(cmdTemplate, filename, options: string,
target: TTarget): TSpec = target: TTarget): TSpec =
let c = parseCmdLine(cmdTemplate % ["target", targetToCmd[target], let c = parseCmdLine(cmdTemplate % ["target", targetToCmd[target],
@ -393,6 +387,11 @@ proc makeTest(test, options: string, cat: Category, action = actionCompile,
result = TTest(cat: cat, name: test, options: options, result = TTest(cat: cat, name: test, options: options,
target: target, action: action, startTime: epochTime()) target: target, action: action, startTime: epochTime())
when defined(windows):
const
# array of modules disabled from compilation test of stdlib.
disabledFiles = ["coro.nim", "fsmonitor.nim"]
else:
const const
# array of modules disabled from compilation test of stdlib. # array of modules disabled from compilation test of stdlib.
disabledFiles = ["-"] disabledFiles = ["-"]