diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-11-05 09:32:09 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-11-05 09:32:09 +0100 |
| commit | 499ae7297bd7d106525a296312d1653e8bf80b7e (patch) | |
| tree | 392802bbbea70e7862b6d284f5746d69044de985 | |
| parent | 8fa3e0cb25c7fec8ea727270dec7700a2ec271e5 (diff) | |
| parent | d606f6b348690998d67cc6c39beb49c000c93a41 (diff) | |
| download | Nim-499ae7297bd7d106525a296312d1653e8bf80b7e.tar.gz | |
Merge branch 'devel' into new-dependency-tracking
| -rw-r--r-- | lib/pure/osproc.nim | 6 | ||||
| -rw-r--r-- | tools/nimsuggest/tester.nim | 2 | ||||
| -rw-r--r-- | tools/nimsuggest/tests/tstrutils.nim | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index 44ec5b548..76bd2dfe1 100644 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -841,15 +841,19 @@ elif not defined(useNimRtl): if data.workingDir.len > 0: setCurrentDir($data.workingDir) var pid: Pid + var err: OSErrorCode if data.optionPoUsePath: res = posix_spawnp(pid, data.sysCommand, fops, attr, data.sysArgs, data.sysEnv) + if res != 0'i32: err = osLastError() else: 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_spawnattr_destroy(attr) - chck res + if res != 0'i32: raiseOSError(err) + return pid else: proc startProcessAuxFork(data: StartProcessData): Pid = diff --git a/tools/nimsuggest/tester.nim b/tools/nimsuggest/tester.nim index f340c23e1..c3c20a5ba 100644 --- a/tools/nimsuggest/tester.nim +++ b/tools/nimsuggest/tester.nim @@ -11,7 +11,7 @@ type script: seq[(string, string)] const - curDir = when defined(windows): "" else: "./" + curDir = when defined(windows): "" else: "" DummyEof = "!EOF!" proc parseTest(filename: string): Test = diff --git a/tools/nimsuggest/tests/tstrutils.nim b/tools/nimsuggest/tests/tstrutils.nim index 667c1660c..f5cda9505 100644 --- a/tools/nimsuggest/tests/tstrutils.nim +++ b/tools/nimsuggest/tests/tstrutils.nim @@ -1,6 +1,6 @@ discard """ -$nimsuggest --tester ../nim/lib/pure/strutils.nim ->def ../nim/lib/pure/strutils.nim:2300:6 +$nimsuggest --tester lib/pure/strutils.nim +>def lib/pure/strutils.nim:2300:6 def;;skTemplate;;system.doAssert;;proc (cond: bool, msg: string): typed;;*/lib/system.nim;;*;;9;;"";;100 """ |