diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
commit | 696c0c48c7c794453b79d2abf45c3f390a9b6fba (patch) | |
tree | 8a74e09ce97f64ea0e3377f6440a2e79d54ce0fd /tests/osproc/tworkingdir.nim | |
parent | 7ac6462cbd30bcdb1c3805fbb06be13b3346ce2a (diff) | |
parent | f2263cd129ff41259db99c68e98f966a681adf78 (diff) | |
download | Nim-696c0c48c7c794453b79d2abf45c3f390a9b6fba.tar.gz |
fixes merge conflict
Diffstat (limited to 'tests/osproc/tworkingdir.nim')
-rw-r--r-- | tests/osproc/tworkingdir.nim | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/osproc/tworkingdir.nim b/tests/osproc/tworkingdir.nim index eeed9240d..7d58d5ae6 100644 --- a/tests/osproc/tworkingdir.nim +++ b/tests/osproc/tworkingdir.nim @@ -12,6 +12,8 @@ else: var process: Process when defined(android): process = startProcess("/system/bin/env", "/system/bin", ["true"]) + elif defined(haiku): + process = startProcess("/bin/env", "/bin", ["true"]) else: process = startProcess("/usr/bin/env", "/usr/bin", ["true"]) let dir2 = getCurrentDir() |