fix for 1.6
This commit is contained in:
parent
39ed5a784e
commit
fe3650ceea
|
@ -154,7 +154,7 @@ else:
|
||||||
when (NimMajor, NimMinor) > (1, 2):
|
when (NimMajor, NimMinor) > (1, 2):
|
||||||
from std/exitprocs import nil
|
from std/exitprocs import nil
|
||||||
template addExitProc(p: proc) =
|
template addExitProc(p: proc) =
|
||||||
when (NimMajor, NimMinor) > (1, 6):
|
when (NimMajor, NimMinor) >= (1, 6):
|
||||||
exitprocs.addExitProc(p)
|
exitprocs.addExitProc(p)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
|
@ -537,7 +537,7 @@ method testRunEnded*(formatter: JUnitOutputFormatter) =
|
||||||
## Completes the report and closes the underlying stream.
|
## Completes the report and closes the underlying stream.
|
||||||
let s = formatter.stream
|
let s = formatter.stream
|
||||||
|
|
||||||
when (NimMajor, NimMinor) > (1, 6):
|
when (NimMajor, NimMinor) >= (1, 6):
|
||||||
{.warning[BareExcept]:off.}
|
{.warning[BareExcept]:off.}
|
||||||
try:
|
try:
|
||||||
s.writeLine("<testsuites>")
|
s.writeLine("<testsuites>")
|
||||||
|
@ -554,7 +554,7 @@ method testRunEnded*(formatter: JUnitOutputFormatter) =
|
||||||
echo "Cannot write JUnit: ", exc.msg
|
echo "Cannot write JUnit: ", exc.msg
|
||||||
quit 1
|
quit 1
|
||||||
|
|
||||||
when (NimMajor, NimMinor) > (1, 6):
|
when (NimMajor, NimMinor) >= (1, 6):
|
||||||
{.warning[BareExcept]:on.}
|
{.warning[BareExcept]:on.}
|
||||||
|
|
||||||
proc glob(matcher, filter: string): bool =
|
proc glob(matcher, filter: string): bool =
|
||||||
|
|
Loading…
Reference in New Issue