diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2021-09-02 22:15:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-03 07:15:08 +0200 |
| commit | 64165f03fc96d6e8293f1b065a2e1e45f9fc1bf8 (patch) | |
| tree | d2a11e54725ba9386470421f6313b8dff5d2b157 /testament | |
| parent | f46569bafdfdd3290baf132f025d61a0e550dd58 (diff) | |
| download | Nim-64165f03fc96d6e8293f1b065a2e1e45f9fc1bf8.tar.gz | |
testament --megatest:off now makes tests non-joinable so that they all run (#18787)
Diffstat (limited to 'testament')
| -rw-r--r-- | testament/categories.nim | 2 | ||||
| -rw-r--r-- | testament/testament.nim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testament/categories.nim b/testament/categories.nim index 6375105ee..6702d24a2 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -541,7 +541,7 @@ proc processSingleTest(r: var TResults, cat: Category, options, test: string, ta proc isJoinableSpec(spec: TSpec): bool = # 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. - result = not spec.sortoutput and + result = useMegatest and not spec.sortoutput and spec.action == actionRun and not fileExists(spec.file.changeFileExt("cfg")) and not fileExists(spec.file.changeFileExt("nims")) and diff --git a/testament/testament.nim b/testament/testament.nim index ab6620c84..105f00156 100644 --- a/testament/testament.nim +++ b/testament/testament.nim @@ -28,6 +28,7 @@ var useColors = true var backendLogging = true var simulate = false var optVerbose = false +var useMegatest = true proc verboseCmd(cmd: string) = if optVerbose: @@ -645,7 +646,6 @@ proc main() = var targetsStr = "" var isMainProcess = true var skipFrom = "" - var useMegatest = true var p = initOptParser() p.next() |