mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-18 17:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://github.com/nim-lang/Nim/pull/15826/files#r585368355 (#17233)

Browse Source
This commit is contained in:
Juan Carlos
2021-03-03 07:58:05 -03:00
committed by GitHub
parent ec068a2687
commit 4982d1c662
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pure/includes/osenv.nim
View File

@@ -5,9 +5,10 @@ when not declared(os) and not declared(ospaths):
when defined(nodejs):
proc getEnv*(key: string, default = ""): string {.tags: [ReadEnvEffect].} =
var ret: cstring
var ret = default.cstring
let key2 = key.cstring
{.emit: "`ret` = process.env[`key2`];".}
{.emit: "const value = process.env[`key2`];".}
{.emit: "if (value !== undefined) { `ret` = value };".}
result = $ret
proc existsEnv*(key: string): bool {.tags: [ReadEnvEffect].} =

6
tests/stdlib/tos.nim
View File

@@ -520,7 +520,7 @@ block ospaths:
# but not `./foo/bar` and `foo/bar`
doAssert joinPath(".", "/lib") == unixToNativePath"./lib"
doAssert joinPath(".","abc") == unixToNativePath"./abc"
# cases related to issue #13455
doAssert joinPath("foo", "", "") == "foo"
doAssert joinPath("foo", "") == "foo"
@@ -566,6 +566,10 @@ block osenv:
doAssert existsEnv(dummyEnvVar) == false
delEnv(dummyEnvVar) # deleting an already deleted env var
doAssert existsEnv(dummyEnvVar) == false
block:
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", "") == ""
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", " ") == " "
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", "Arrakis") == "Arrakis"
block isRelativeTo:
doAssert isRelativeTo("/foo", "/")