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

testament --megatest:off now makes tests non-joinable so that they all run (#18787)

Browse source
This commit is contained in:
Timothee Cour 2021-09-02 22:15:08 -07:00 • committed by GitHub
commit 64165f03fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testament/categories.nim
View file

@ -541,7 +541,7 @@ proc processSingleTest(r: var TResults, cat: Category, options, test: string, ta
proc isJoinableSpec(spec: TSpec): bool = proc isJoinableSpec(spec: TSpec): bool =
# xxx simplify implementation using a whitelist of fields that are allowed to be # xxx simplify implementation using a whitelist of fields that are allowed to be
# set to non-default values (use `fieldPairs`), to avoid issues like bug #16576. # set to non-default values (use `fieldPairs`), to avoid issues like bug #16576.
result = not spec.sortoutput and result = useMegatest and not spec.sortoutput and
spec.action == actionRun and spec.action == actionRun and
not fileExists(spec.file.changeFileExt("cfg")) and not fileExists(spec.file.changeFileExt("cfg")) and
not fileExists(spec.file.changeFileExt("nims")) and not fileExists(spec.file.changeFileExt("nims")) and

2
testament/testament.nim
View file

@ -28,6 +28,7 @@ var useColors = true
var backendLogging = true var backendLogging = true
var simulate = false var simulate = false
var optVerbose = false var optVerbose = false
var useMegatest = true
proc verboseCmd(cmd: string) = proc verboseCmd(cmd: string) =
if optVerbose: if optVerbose:
@ -645,7 +646,6 @@ proc main() =
var targetsStr = "" var targetsStr = ""
var isMainProcess = true var isMainProcess = true
var skipFrom = "" var skipFrom = ""
var useMegatest = true
var p = initOptParser() var p = initOptParser()
p.next() p.next()