Adds $SILENT replacement to reduce test output verbosity.

2025-12-28 17:04:41 +00:00 · 2013-06-16 13:00:24 +02:00
parent d18d6ba019
commit d2def332fd
11 changed files with 52 additions and 44 deletions
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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

--- 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
--- 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.\}
--- 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

--- 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 =