make tests green again

This commit is contained in:
Andreas Rumpf 2016-07-10 01:16:40 +02:00
commit d7e172a6bc
6 changed files with 5 additions and 12 deletions

View file

@ -965,7 +965,6 @@ const
var ggDebug* {.deprecated.}: bool ## convenience switch for trying out things var ggDebug* {.deprecated.}: bool ## convenience switch for trying out things
var var
gMainPackageId*: int gMainPackageId*: int
gMainPackageNotes*: TNoteKinds
proc isCallExpr*(n: PNode): bool = proc isCallExpr*(n: PNode): bool =
result = n.kind in nkCallKinds result = n.kind in nkCallKinds

View file

@ -181,9 +181,11 @@ proc processSpecificNote*(arg: string, state: TSpecialWord, pass: TCmdLinePass,
case whichKeyword(substr(arg, i)) case whichKeyword(substr(arg, i))
of wOn: of wOn:
incl(gNotes, n) incl(gNotes, n)
incl(gMainPackageNotes, n)
incl(enableNotes, n) incl(enableNotes, n)
of wOff: of wOff:
excl(gNotes, n) excl(gNotes, n)
excl(gMainPackageNotes, n)
incl(disableNotes, n) incl(disableNotes, n)
excl(ForeignPackageNotes, n) excl(ForeignPackageNotes, n)
else: localError(info, errOnOrOffExpectedButXFound, arg) else: localError(info, errOnOrOffExpectedButXFound, arg)
@ -548,6 +550,7 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo) =
gNotes = NotesVerbosity[gVerbosity] gNotes = NotesVerbosity[gVerbosity]
incl(gNotes, enableNotes) incl(gNotes, enableNotes)
excl(gNotes, disableNotes) excl(gNotes, disableNotes)
gMainPackageNotes = gNotes
of "parallelbuild": of "parallelbuild":
expectArg(switch, arg, pass, info) expectArg(switch, arg, pass, info)
gNumberOfProcessors = parseInt(arg) gNumberOfProcessors = parseInt(arg)

View file

@ -621,6 +621,7 @@ var
gHintCounter*: int = 0 gHintCounter*: int = 0
gWarnCounter*: int = 0 gWarnCounter*: int = 0
gErrorMax*: int = 1 # stop after gErrorMax errors gErrorMax*: int = 1 # stop after gErrorMax errors
gMainPackageNotes*: TNoteKinds = NotesVerbosity[1]
proc unknownLineInfo*(): TLineInfo = proc unknownLineInfo*(): TLineInfo =
result.line = int16(-1) result.line = int16(-1)

View file

@ -155,4 +155,3 @@ proc runNimScript*(scriptName: string; freshDefines=true) =
#initDefines() #initDefines()
undefSymbol("nimscript") undefSymbol("nimscript")
undefSymbol("nimconfig") undefSymbol("nimconfig")
gMainPackageNotes = {}

View file

@ -23,10 +23,6 @@ arm.linux.gcc.linkerexe = "arm-linux-gcc"
mips.linux.gcc.exe = "mips-openwrt-linux-gcc" mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
@if not nimfix:
cs:partial
@end
path="$lib/deprecated/core" path="$lib/deprecated/core"
path="$lib/deprecated/pure" path="$lib/deprecated/pure"
path="$lib/pure/collections" path="$lib/pure/collections"
@ -168,10 +164,5 @@ vcc.options.always = "/nologo"
vcc.options.speed = "/O2 /arch:SSE2" vcc.options.speed = "/O2 /arch:SSE2"
vcc.options.size = "/O1" vcc.options.size = "/O1"
# Configuration for the Digital Mars C/C++ compiler:
@if windows:
dmc.path = r"$nimrod\dist\dm\bin"
@end
# Configuration for the Tiny C Compiler: # Configuration for the Tiny C Compiler:
tcc.options.always = "-w" tcc.options.always = "-w"

View file

@ -10,7 +10,7 @@ import ospaths
warning("uninit", off) warning("uninit", off)
hint("processing", off) hint("processing", off)
#--verbosity:2
patchFile("stdlib", "math", "mymath") patchFile("stdlib", "math", "mymath")
task listDirs, "lists every subdirectory": task listDirs, "lists every subdirectory":