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

Revert #17398 and #17402 (#18480)

Browse source 
* Revert "followup #17398: `getTempDir`, `getConfigDir` now do not have trailing DirSep (#17402)"

This reverts commit 2356d0603f.

* Revert "fix #17393 getHomeDir and expandTilde should not include trailing `/` (#17398)"

This reverts commit bebf2ce24a.

* fix test
This commit is contained in:
Miran 2021-07-18 11:04:19 +02:00 • committed by GitHub
commit 8091545f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/stdlib/tos.nim
View file

@ -594,12 +594,12 @@ block getTempDir:
if existsEnv("TMPDIR"):
let origTmpDir = getEnv("TMPDIR")
putEnv("TMPDIR", "/mytmp")
doAssert getTempDir() == "/mytmp"
doAssert getTempDir() == "/mytmp/"
delEnv("TMPDIR")
doAssert getTempDir() == "/tmp"
doAssert getTempDir() == "/tmp/"
putEnv("TMPDIR", origTmpDir)
else:
doAssert getTempDir() == "/tmp"
doAssert getTempDir() == "/tmp/"
block: # getCacheDir
doAssert getCacheDir().dirExists

2
tests/stdlib/ttempfiles.nim
View file

@ -40,7 +40,7 @@ block: # createTempDir
doAssert dirExists(dir1)
doAssert dir1.lastPathPart.contains(re"^D20210502T100442(\w+).tmp$")
doAssert dir1.parentDir == getTempDir()
doAssert dir1.parentDir == getTempDir().normalizePathEnd()
block:
let dir3 = createTempDir(prefix, "_mytmp", ".")