Makes caasdriver exit with number of errors.
Also displays result and separator after each test.
This commit is contained in:
parent
b92c87e2ec
commit
2793170fed
2 changed files with 16 additions and 8 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -167,4 +167,7 @@ examples/cross_calculator/android/tags
|
||||||
/run.json
|
/run.json
|
||||||
/testresults.html
|
/testresults.html
|
||||||
/testresults.json
|
/testresults.json
|
||||||
|
/tests/caas/imported
|
||||||
|
/tests/caas/main
|
||||||
|
/tests/caasdriver
|
||||||
/tools/nimgrep
|
/tools/nimgrep
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@ proc startNimrodSession*(project: string): TNimrodSession =
|
||||||
proc doCommand*(session: var TNimrodSession, command: string): string =
|
proc doCommand*(session: var TNimrodSession, command: string): string =
|
||||||
session.nim.inputStream.write(command & "\n")
|
session.nim.inputStream.write(command & "\n")
|
||||||
session.nim.inputStream.flush
|
session.nim.inputStream.flush
|
||||||
|
|
||||||
result = ""
|
result = ""
|
||||||
|
|
||||||
while true:
|
while true:
|
||||||
var line = TaintedString("")
|
var line = TaintedString("")
|
||||||
if session.nim.outputStream.readLine(line):
|
if session.nim.outputStream.readLine(line):
|
||||||
|
|
@ -38,7 +38,7 @@ proc doScenario(script: string, output: PStream): bool =
|
||||||
|
|
||||||
var f = open(script)
|
var f = open(script)
|
||||||
var project = TaintedString("")
|
var project = TaintedString("")
|
||||||
|
|
||||||
if f.readLine(project):
|
if f.readLine(project):
|
||||||
var
|
var
|
||||||
s = startNimrodSession(script.dirname / project.string)
|
s = startNimrodSession(script.dirname / project.string)
|
||||||
|
|
@ -78,9 +78,14 @@ iterator caasTestsRunner*(filter = ""): tuple[test, output: string,
|
||||||
yield (scenario, outStream.data, r)
|
yield (scenario, outStream.data, r)
|
||||||
|
|
||||||
when isMainModule:
|
when isMainModule:
|
||||||
var filter = ""
|
var
|
||||||
|
filter = ""
|
||||||
|
failures = 0
|
||||||
if paramCount() > 0: filter = paramStr(1)
|
if paramCount() > 0: filter = paramStr(1)
|
||||||
|
|
||||||
for t, o, r in caasTestsRunner(filter):
|
for test, output, result in caasTestsRunner(filter):
|
||||||
echo t, "\n", o
|
echo test, "\n", output, "-> ", $result, "\n-----"
|
||||||
|
if not result:
|
||||||
|
failures += 1
|
||||||
|
|
||||||
|
quit(failures)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue