mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 17:04:41 +00:00
* fix #17960: honor `matrix` for all action
This commit is contained in:
@@ -478,14 +478,16 @@ proc equalModuloLastNewline(a, b: string): bool =
|
||||
proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec,
|
||||
target: TTarget, nimcache: string, extraOptions = "") =
|
||||
test.startTime = epochTime()
|
||||
template callNimCompilerImpl(): untyped =
|
||||
# xxx this used to also pass: `--stdout --hint:Path:off`, but was done inconsistently
|
||||
# with other branches
|
||||
callNimCompiler(expected.getCmd, test.name, test.options, nimcache, target, extraOptions)
|
||||
case expected.action
|
||||
of actionCompile:
|
||||
var given = callNimCompiler(expected.getCmd, test.name, test.options, nimcache, target,
|
||||
extraOptions = " --stdout --hint[Path]:off --hint[Processing]:off")
|
||||
var given = callNimCompilerImpl()
|
||||
compilerOutputTests(test, target, given, expected, r)
|
||||
of actionRun:
|
||||
var given = callNimCompiler(expected.getCmd, test.name, test.options,
|
||||
nimcache, target, extraOptions)
|
||||
var given = callNimCompilerImpl()
|
||||
if given.err != reSuccess:
|
||||
r.addResult(test, target, "", "$ " & given.cmd & '\n' & given.nimout, given.err)
|
||||
else:
|
||||
@@ -538,8 +540,7 @@ proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec,
|
||||
else:
|
||||
compilerOutputTests(test, target, given, expected, r)
|
||||
of actionReject:
|
||||
var given = callNimCompiler(expected.getCmd, test.name, test.options,
|
||||
nimcache, target)
|
||||
let given = callNimCompilerImpl()
|
||||
cmpMsgs(r, expected, given, test, target)
|
||||
|
||||
proc targetHelper(r: var TResults, test: TTest, expected: TSpec, extraOptions = "") =
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
discard """
|
||||
action: reject
|
||||
nimout: '''tusages.nim(22, 5) Error: 'BAD_STYLE' should be: 'BADSTYLE' [proc declared in tusages.nim(11, 6)]'''
|
||||
cmd: "nim $target --styleCheck:error --styleCheck:usages $file"
|
||||
matrix: "--styleCheck:error --styleCheck:usages"
|
||||
"""
|
||||
|
||||
# xxx pending bug #17960, use: matrix: "--styleCheck:error --styleCheck:usages"
|
||||
|
||||
|
||||
import strutils
|
||||
|
||||
|
||||
Reference in New Issue
Block a user