jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds $SILENT replacement to reduce test output verbosity.

Browse source
This commit is contained in:
Grzegorz Adam Hankiewicz 2013-06-16 13:00:24 +02:00
commit d2def332fd
11 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/caas/basic-recompile.txt
View file

@ -1,10 +1,10 @@
main.nim main.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> c
# The "Processing" string will be found always in proc mode since each # The "Processing" string will be found always in proc mode since each
# compilation command will generate it. We need to test it only in Caas mode to # compilation command will generate it. We need to test it only in Caas mode to
# verify the server is not recompiling again the file. # verify the server is not recompiling again the file.
CaasRun > c --verbosity:0 --hints:on
CaasRun ! Processing CaasRun ! Processing
SuccessX CaasRun SuccessX

4
tests/caas/compile-suggest.txt
View file

@ -1,7 +1,7 @@
main.nim main.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest > idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest $SILENT
skField\tx skField\tx
skField\ty skField\ty

8
tests/caas/compile-then-def.txt
View file

@ -1,9 +1,11 @@
main.nim main.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> idetools --track:$TESTNIM,5,18 --def
> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on
strutils.toUpper strutils.toUpper
! SuccessX ! SuccessX
> idetools --track:$TESTNIM,5,18 --def
> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on
strutils.toUpper strutils.toUpper
! SuccessX ! SuccessX

8
tests/caas/def-def-compile.txt
View file

@ -1,10 +1,12 @@
main.nim main.nim
> idetools --track:$TESTNIM,5,18 --def > idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on
strutils.toUpper strutils.toUpper
! SuccessX ! SuccessX
> idetools --track:$TESTNIM,5,18 --def
> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on
strutils.toUpper strutils.toUpper
! SuccessX ! SuccessX
> c
> c --verbosity:0 --hints:on
SuccessX SuccessX

5
tests/caas/def-then-compile.txt
View file

@ -1,7 +1,8 @@
main.nim main.nim
> idetools --track:$TESTNIM,5,18 --def > idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on
strutils.toUpper strutils.toUpper
! SuccessX ! SuccessX
> c
> c --verbosity:0 --hints:on
SuccessX SuccessX

36
tests/caas/idetools_api.txt
View file

@ -1,44 +1,44 @@
idetools_api.nim idetools_api.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> idetools --track:$TESTNIM,4,11 --def > idetools --track:$TESTNIM,4,11 --def $SILENT
def\tskType\tsystem.TFile\tTFile def\tskType\tsystem.TFile\tTFile
> idetools --track:$TESTNIM,5,7 --def > idetools --track:$TESTNIM,5,7 --def $SILENT
def\tskProc\tsystem.Open\tproc \(var TFile, string, TFileMode, int\): bool def\tskProc\tsystem.Open\tproc \(var TFile, string, TFileMode, int\): bool
> idetools --track:$TESTNIM,5,21 --def > idetools --track:$TESTNIM,5,21 --def $SILENT
def\tskProc\tsystem.\&\tproc \(string, string\): string\{.noSideEffect.\} def\tskProc\tsystem.\&\tproc \(string, string\): string\{.noSideEffect.\}
> idetools --track:$TESTNIM,5,38 --def > idetools --track:$TESTNIM,5,38 --def $SILENT
def\tskEnumField\tsystem.TFileMode.fmWrite\tTFileMode def\tskEnumField\tsystem.TFileMode.fmWrite\tTFileMode
> idetools --track:$TESTNIM,7,6 --def > idetools --track:$TESTNIM,7,6 --def $SILENT
def\tskProc\tsystem.Close\tproc \(TFile\) def\tskProc\tsystem.Close\tproc \(TFile\)
> idetools --track:$TESTNIM,12,23 --def > idetools --track:$TESTNIM,12,23 --def $SILENT
def\tskIterator\tunicode.runes\titerator \(string\): TRune def\tskIterator\tunicode.runes\titerator \(string\): TRune
> idetools --track:$TESTNIM,12,15 --def > idetools --track:$TESTNIM,12,15 --def $SILENT
def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr
> idetools --track:$TESTNIM,15,7 --def > idetools --track:$TESTNIM,15,7 --def $SILENT
# ProcRun mode will fail the next line, because the type is returned empty. # ProcRun mode will fail the next line, because the type is returned empty.
def\tskConst\t$MODULE.SOME_SEQUENCE\tseq\[int\]\t def\tskConst\t$MODULE.SOME_SEQUENCE\tseq\[int\]\t
> idetools --track:$TESTNIM,15,23 --def > idetools --track:$TESTNIM,15,23 --def $SILENT
def\tskProc\tsystem.@\tproc \(array\[IDX, T\]\): seq\[T\]\{.noSideEffect.\} def\tskProc\tsystem.@\tproc \(array\[IDX, T\]\): seq\[T\]\{.noSideEffect.\}
> idetools --track:$TESTNIM,17,3 --def > idetools --track:$TESTNIM,17,3 --def $SILENT
# ProcRun mode will fail the next line, because the type is returned empty. # ProcRun mode will fail the next line, because the type is returned empty.
def\tskType\t$MODULE.bad_string\tbad_string\t def\tskType\t$MODULE.bad_string\tbad_string\t
> idetools --track:$TESTNIM,11,24 --def > idetools --track:$TESTNIM,11,24 --def $SILENT
def\tskParam\t$MODULE.test_iterators.filename\tstring def\tskParam\t$MODULE.test_iterators.filename\tstring
> idetools --track:$TESTNIM,6,5 --def > idetools --track:$TESTNIM,6,5 --def $SILENT
def\tskVar\t$MODULE.test_enums.o\tTFile def\tskVar\t$MODULE.test_enums.o\tTFile
> idetools --track:$TESTNIM,12,34 --def > idetools --track:$TESTNIM,12,34 --def $SILENT
def\tskLet\t$MODULE.test_iterators.input\tTaintedString def\tskLet\t$MODULE.test_iterators.input\tTaintedString
> idetools --track:$TESTNIM,13,35 --def > idetools --track:$TESTNIM,13,35 --def $SILENT
def\tskForVar\t$MODULE.test_iterators.letter\tTRune def\tskForVar\t$MODULE.test_iterators.letter\tTRune
> idetools --track:$TESTNIM,23,3 --def > idetools --track:$TESTNIM,23,3 --def $SILENT
def\tskResult\t$MODULE.adder.result\tint def\tskResult\t$MODULE.adder.result\tint
> idetools --track:$TESTNIM,19,6 --def > idetools --track:$TESTNIM,19,6 --def $SILENT
# ProcRun mode will fail the next line, because the type is returned empty. # ProcRun mode will fail the next line, because the type is returned empty.
def\tskField\t$MODULE.TPerson.name\tbad_string\t def\tskField\t$MODULE.TPerson.name\tbad_string\t
> idetools --track:$TESTNIM,43,7 --def > idetools --track:$TESTNIM,43,7 --def $SILENT
def\tskMethod\t$MODULE.eval\tproc \(PPlusExpr\): int\t def\tskMethod\t$MODULE.eval\tproc \(PPlusExpr\): int\t

10
tests/caas/issue_416_template_shift.txt
View file

@ -1,14 +1,14 @@
issue_416_template_shift.nim issue_416_template_shift.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> idetools --track:$TESTNIM,12,28 --def > idetools --track:$TESTNIM,12,28 --def $SILENT
def\tskType\tsystem.string\tstring def\tskType\tsystem.string\tstring
> idetools --track:$TESTNIM,12,35 --def > idetools --track:$TESTNIM,12,35 --def $SILENT
def\tskLet\t$MODULE.failtest.input\tTaintedString def\tskLet\t$MODULE.failtest.input\tTaintedString
# The following fail because they seem shifted one colum to the right. # The following fail because they seem shifted one colum to the right.
> idetools --track:$TESTNIM,12,16 --def > idetools --track:$TESTNIM,12,16 --def $SILENT
def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr def\tskTemplate\tsequtils.toSeq\tproc \(expr\): expr
> idetools --track:$TESTNIM,12,22 --def > idetools --track:$TESTNIM,12,22 --def $SILENT
def\tskIterator\tunicode.runes\titerator \(string\): TRune def\tskIterator\tunicode.runes\titerator \(string\): TRune

10
tests/caas/issue_452_export_shift.txt
View file

@ -1,11 +1,11 @@
issue_452_export_shift.nim issue_452_export_shift.nim
> c > c --verbosity:0 --hints:on
SuccessX SuccessX
> idetools --track:$TESTNIM,2,2 --def > idetools --track:$TESTNIM,2,2 --def $SILENT
def\tskConst\t$MODULE.VERSION_STR1\tstring def\tskConst\t$MODULE.VERSION_STR1\tstring
> idetools --track:$TESTNIM,3,2 --def > idetools --track:$TESTNIM,3,2 --def $SILENT
def\tskConst\t$MODULE.VERSION_STR2\tstring def\tskConst\t$MODULE.VERSION_STR2\tstring
> idetools --track:$TESTNIM,7,5 --def > idetools --track:$TESTNIM,7,5 --def $SILENT
def\tskProc\t$MODULE.forward1\tproc \(\): string\t def\tskProc\t$MODULE.forward1\tproc \(\): string\t
> idetools --track:$TESTNIM,8,5 --def > idetools --track:$TESTNIM,8,5 --def $SILENT
def\tskProc\t$MODULE.forward2\tproc \(\): string\t def\tskProc\t$MODULE.forward2\tproc \(\): string\t

2
tests/caas/issue_477_dynamic_dispatch.txt
View file

@ -1,5 +1,5 @@
issue_477_dynamic_dispatch.nim issue_477_dynamic_dispatch.nim
> c --run > c --run
SuccessX SuccessX
> idetools --track:issue_477_dynamic_dispatch.nim,19,5 --def > idetools --track:issue_477_dynamic_dispatch.nim,19,5 --def $SILENT
def\tskMethod\tissue_477_dynamic_dispatch.collide\tproc \(TUnit, TThing\)\{.inline.\} def\tskMethod\tissue_477_dynamic_dispatch.collide\tproc \(TUnit, TThing\)\{.inline.\}

4
tests/caas/suggest-compile.txt
View file

@ -1,7 +1,7 @@
main.nim main.nim
> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest > idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest $SILENT
skField\tx skField\tx
skField\ty skField\ty
> c > c --verbosity:0 --hints:on
SuccessX SuccessX

3
tests/caasdriver.nim
View file

@ -59,6 +59,8 @@ const
modes = [CaasRun, ProcRun, SymbolProcRun] modes = [CaasRun, ProcRun, SymbolProcRun]
filenameReplaceVar = "$TESTNIM" filenameReplaceVar = "$TESTNIM"
moduleReplaceVar = "$MODULE" moduleReplaceVar = "$MODULE"
silentReplaceVar = "$SILENT"
silentReplaceText = "--verbosity:0 --hints:off"
var var
TesterDir = getAppDir() TesterDir = getAppDir()
@ -67,6 +69,7 @@ var
proc replaceVars(session: var TNimrodSession, text: string): string = proc replaceVars(session: var TNimrodSession, text: string): string =
result = text.replace(filenameReplaceVar, session.filename) result = text.replace(filenameReplaceVar, session.filename)
result = result.replace(moduleReplaceVar, session.modname) result = result.replace(moduleReplaceVar, session.modname)
result = result.replace(silentReplaceVar, silentReplaceText)
proc startNimrodSession(project, script: string, mode: TRunMode): proc startNimrodSession(project, script: string, mode: TRunMode):
TNimrodSession = TNimrodSession =