From d2def332fd6d290bd74cb1e491b3c8f8f09d894a Mon Sep 17 00:00:00 2001 From: Grzegorz Adam Hankiewicz Date: Sun, 16 Jun 2013 13:00:24 +0200 Subject: [PATCH] Adds $SILENT replacement to reduce test output verbosity. --- tests/caas/basic-recompile.txt | 6 ++-- tests/caas/compile-suggest.txt | 4 +-- tests/caas/compile-then-def.txt | 8 +++-- tests/caas/def-def-compile.txt | 8 +++-- tests/caas/def-then-compile.txt | 5 ++-- tests/caas/idetools_api.txt | 36 +++++++++++------------ tests/caas/issue_416_template_shift.txt | 10 +++---- tests/caas/issue_452_export_shift.txt | 10 +++---- tests/caas/issue_477_dynamic_dispatch.txt | 2 +- tests/caas/suggest-compile.txt | 4 +-- tests/caasdriver.nim | 3 ++ 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/tests/caas/basic-recompile.txt b/tests/caas/basic-recompile.txt index d869944b95..620e0c059e 100644 --- a/tests/caas/basic-recompile.txt +++ b/tests/caas/basic-recompile.txt @@ -1,10 +1,10 @@ main.nim -> c +> c --verbosity:0 --hints:on SuccessX -> c # 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 # verify the server is not recompiling again the file. +CaasRun > c --verbosity:0 --hints:on CaasRun ! Processing -SuccessX +CaasRun SuccessX diff --git a/tests/caas/compile-suggest.txt b/tests/caas/compile-suggest.txt index 6170603470..378320014d 100644 --- a/tests/caas/compile-suggest.txt +++ b/tests/caas/compile-suggest.txt @@ -1,7 +1,7 @@ main.nim -> c +> c --verbosity:0 --hints:on SuccessX -> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest +> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest $SILENT skField\tx skField\ty diff --git a/tests/caas/compile-then-def.txt b/tests/caas/compile-then-def.txt index 66ff293469..72ba46b044 100644 --- a/tests/caas/compile-then-def.txt +++ b/tests/caas/compile-then-def.txt @@ -1,9 +1,11 @@ main.nim -> c +> c --verbosity:0 --hints:on SuccessX -> idetools --track:$TESTNIM,5,18 --def + +> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on strutils.toUpper ! SuccessX -> idetools --track:$TESTNIM,5,18 --def + +> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on strutils.toUpper ! SuccessX diff --git a/tests/caas/def-def-compile.txt b/tests/caas/def-def-compile.txt index 12ba7e993c..21d5ea962d 100644 --- a/tests/caas/def-def-compile.txt +++ b/tests/caas/def-def-compile.txt @@ -1,10 +1,12 @@ main.nim -> idetools --track:$TESTNIM,5,18 --def +> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on strutils.toUpper ! SuccessX -> idetools --track:$TESTNIM,5,18 --def + +> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on strutils.toUpper ! SuccessX -> c + +> c --verbosity:0 --hints:on SuccessX diff --git a/tests/caas/def-then-compile.txt b/tests/caas/def-then-compile.txt index e44af7f63e..2214bf02c1 100644 --- a/tests/caas/def-then-compile.txt +++ b/tests/caas/def-then-compile.txt @@ -1,7 +1,8 @@ main.nim -> idetools --track:$TESTNIM,5,18 --def +> idetools --track:$TESTNIM,5,18 --def --verbosity:0 --hints:on strutils.toUpper ! SuccessX -> c + +> c --verbosity:0 --hints:on SuccessX diff --git a/tests/caas/idetools_api.txt b/tests/caas/idetools_api.txt index bc1dc6a5f4..c4c22399e8 100644 --- a/tests/caas/idetools_api.txt +++ b/tests/caas/idetools_api.txt @@ -1,44 +1,44 @@ idetools_api.nim -> c +> c --verbosity:0 --hints:on SuccessX -> idetools --track:$TESTNIM,4,11 --def +> idetools --track:$TESTNIM,4,11 --def $SILENT 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 -> idetools --track:$TESTNIM,5,21 --def +> idetools --track:$TESTNIM,5,21 --def $SILENT 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 -> idetools --track:$TESTNIM,7,6 --def +> idetools --track:$TESTNIM,7,6 --def $SILENT 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 -> idetools --track:$TESTNIM,12,15 --def +> idetools --track:$TESTNIM,12,15 --def $SILENT 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. 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.\} -> 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. 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 -> idetools --track:$TESTNIM,6,5 --def +> idetools --track:$TESTNIM,6,5 --def $SILENT 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 -> idetools --track:$TESTNIM,13,35 --def +> idetools --track:$TESTNIM,13,35 --def $SILENT 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 -> 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. 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 diff --git a/tests/caas/issue_416_template_shift.txt b/tests/caas/issue_416_template_shift.txt index 951a21612a..b1f47c1ac6 100644 --- a/tests/caas/issue_416_template_shift.txt +++ b/tests/caas/issue_416_template_shift.txt @@ -1,14 +1,14 @@ issue_416_template_shift.nim -> c +> c --verbosity:0 --hints:on SuccessX -> idetools --track:$TESTNIM,12,28 --def +> idetools --track:$TESTNIM,12,28 --def $SILENT 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 # 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 -> idetools --track:$TESTNIM,12,22 --def +> idetools --track:$TESTNIM,12,22 --def $SILENT def\tskIterator\tunicode.runes\titerator \(string\): TRune diff --git a/tests/caas/issue_452_export_shift.txt b/tests/caas/issue_452_export_shift.txt index 56ba0b74f7..4676ed71e2 100644 --- a/tests/caas/issue_452_export_shift.txt +++ b/tests/caas/issue_452_export_shift.txt @@ -1,11 +1,11 @@ issue_452_export_shift.nim -> c +> c --verbosity:0 --hints:on SuccessX -> idetools --track:$TESTNIM,2,2 --def +> idetools --track:$TESTNIM,2,2 --def $SILENT 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 -> idetools --track:$TESTNIM,7,5 --def +> idetools --track:$TESTNIM,7,5 --def $SILENT 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 diff --git a/tests/caas/issue_477_dynamic_dispatch.txt b/tests/caas/issue_477_dynamic_dispatch.txt index 068a9d022b..12fd750deb 100644 --- a/tests/caas/issue_477_dynamic_dispatch.txt +++ b/tests/caas/issue_477_dynamic_dispatch.txt @@ -1,5 +1,5 @@ issue_477_dynamic_dispatch.nim > c --run 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.\} diff --git a/tests/caas/suggest-compile.txt b/tests/caas/suggest-compile.txt index ac61872361..66ae795ed6 100644 --- a/tests/caas/suggest-compile.txt +++ b/tests/caas/suggest-compile.txt @@ -1,7 +1,7 @@ main.nim -> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest +> idetools --trackDirty:main_dirty.nim,$TESTNIM,12,7 --suggest $SILENT skField\tx skField\ty -> c +> c --verbosity:0 --hints:on SuccessX diff --git a/tests/caasdriver.nim b/tests/caasdriver.nim index cd27839c78..f6f3d4e384 100644 --- a/tests/caasdriver.nim +++ b/tests/caasdriver.nim @@ -59,6 +59,8 @@ const modes = [CaasRun, ProcRun, SymbolProcRun] filenameReplaceVar = "$TESTNIM" moduleReplaceVar = "$MODULE" + silentReplaceVar = "$SILENT" + silentReplaceText = "--verbosity:0 --hints:off" var TesterDir = getAppDir() @@ -67,6 +69,7 @@ var proc replaceVars(session: var TNimrodSession, text: string): string = result = text.replace(filenameReplaceVar, session.filename) result = result.replace(moduleReplaceVar, session.modname) + result = result.replace(silentReplaceVar, silentReplaceText) proc startNimrodSession(project, script: string, mode: TRunMode): TNimrodSession =