mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-17 14:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes for the tester; the tester now supports running of single tests

Browse Source
This commit is contained in:
Araq
2011-11-08 01:29:29 +01:00
parent 0b4d5e45b9
commit 25e813b5d0
10 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pure/osproc.nim
View File

@@ -568,7 +568,7 @@ elif not defined(useNimRtl):
if waitPid(p.id, p.exitCode, 0) < 0:
p.exitCode = -3
OSError()
result = int(p.exitCode)
result = int(p.exitCode) shr 8
proc peekExitCode(p: PProcess): int =
if p.exitCode != -3: return p.exitCode
@@ -576,7 +576,7 @@ elif not defined(useNimRtl):
var b = ret == int(p.id)
if b: result = -1
if p.exitCode == -3: result = -1
else: result = p.exitCode
else: result = p.exitCode.int shr 8
proc inputStream(p: PProcess): PStream =
var f: TFile
@@ -641,14 +641,12 @@ proc execCmdEx*(command: string, options: set[TProcessOption] = {
var p = startCmd(command, options)
var outp = outputStream(p)
result = (TaintedString"", -1)
while not outp.atEnd(outp):
while true:
result[1] = peekExitCode(p)
if result[1] != -1 and outp.atEnd(outp): break
result[0].string.add(outp.readLine().string)
result[0].string.add("\n")
result[1] = peekExitCode(p)
if result[1] != -1: break
outp.close(outp)
if result[1] == -1:
result[1] = peekExitCode(p)
close(p)