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

Merge branch 'devel' into new-dependency-tracking

Browse source
This commit is contained in:
Andreas Rumpf 2016-11-05 09:32:09 +01:00
commit 499ae7297b
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/osproc.nim
View file

@ -841,15 +841,19 @@ elif not defined(useNimRtl):
if data.workingDir.len > 0: if data.workingDir.len > 0:
setCurrentDir($data.workingDir) setCurrentDir($data.workingDir)
var pid: Pid var pid: Pid
var err: OSErrorCode
if data.optionPoUsePath: if data.optionPoUsePath:
res = posix_spawnp(pid, data.sysCommand, fops, attr, data.sysArgs, data.sysEnv) res = posix_spawnp(pid, data.sysCommand, fops, attr, data.sysArgs, data.sysEnv)
if res != 0'i32: err = osLastError()
else: else:
res = posix_spawn(pid, data.sysCommand, fops, attr, data.sysArgs, data.sysEnv) res = posix_spawn(pid, data.sysCommand, fops, attr, data.sysArgs, data.sysEnv)
if res != 0'i32: err = osLastError()
discard posix_spawn_file_actions_destroy(fops) discard posix_spawn_file_actions_destroy(fops)
discard posix_spawnattr_destroy(attr) discard posix_spawnattr_destroy(attr)
chck res if res != 0'i32: raiseOSError(err)
return pid return pid
else: else:
proc startProcessAuxFork(data: StartProcessData): Pid = proc startProcessAuxFork(data: StartProcessData): Pid =

2
tools/nimsuggest/tester.nim
View file

@ -11,7 +11,7 @@ type
script: seq[(string, string)] script: seq[(string, string)]
const const
curDir = when defined(windows): "" else: "./" curDir = when defined(windows): "" else: ""
DummyEof = "!EOF!" DummyEof = "!EOF!"
proc parseTest(filename: string): Test = proc parseTest(filename: string): Test =

4
tools/nimsuggest/tests/tstrutils.nim
View file

@ -1,6 +1,6 @@
discard """ discard """
$nimsuggest --tester ../nim/lib/pure/strutils.nim $nimsuggest --tester lib/pure/strutils.nim
>def ../nim/lib/pure/strutils.nim:2300:6 >def lib/pure/strutils.nim:2300:6
def;;skTemplate;;system.doAssert;;proc (cond: bool, msg: string): typed;;*/lib/system.nim;;*;;9;;"";;100 def;;skTemplate;;system.doAssert;;proc (cond: bool, msg: string): typed;;*/lib/system.nim;;*;;9;;"";;100
""" """