From 0a6787f956c294721839484f02bd4a64af92d8fd Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sat, 5 Nov 2016 09:04:16 +0100
Subject: [PATCH 1/2] better error handling for osproc.nim

---
 lib/pure/osproc.nim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index 44ec5b5484..76bd2dfe1d 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 =

From d606f6b348690998d67cc6c39beb49c000c93a41 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sat, 5 Nov 2016 09:07:51 +0100
Subject: [PATCH 2/2] cleanup nimsuggest tests

---
 tools/nimsuggest/tester.nim          | 4 ++--
 tools/nimsuggest/tests/tstrutils.nim | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/nimsuggest/tester.nim b/tools/nimsuggest/tester.nim
index 70a7da5b26..ecd33b0a16 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 =
@@ -90,7 +90,7 @@ proc runTest(filename: string): int =
 
 proc main() =
   var failures = 0
-  for x in walkFiles("tests/t*.nim"):
+  for x in walkFiles(getAppDir() / "tests/t*.nim"):
     echo "Test ", x
     failures += runTest(expandFilename(x))
   if failures > 0:
diff --git a/tools/nimsuggest/tests/tstrutils.nim b/tools/nimsuggest/tests/tstrutils.nim
index 667c1660c4..f5cda95053 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
 """