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

followup #18453 (#18582)

Browse source
This commit is contained in:
Timothee Cour 2021-07-25 12:55:33 -07:00 • committed by GitHub
commit 5f7db65257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/stdlib/tos.nim
View file

@ -558,9 +558,9 @@ block ospaths:
doAssert joinPath("foo","abc") == unixToNativePath"foo/abc" doAssert joinPath("foo","abc") == unixToNativePath"foo/abc"
doAssert joinPath("","abc") == unixToNativePath"abc" doAssert joinPath("","abc") == unixToNativePath"abc"
doAssert joinPath("gook/.","abc") == unixToNativePath"gook/abc" doAssert joinPath("zook/.","abc") == unixToNativePath"zook/abc"
# controversial: inconsistent with `joinPath("gook/.","abc")` # controversial: inconsistent with `joinPath("zook/.","abc")`
# on linux, `./foo` and `foo` are treated a bit differently for executables # on linux, `./foo` and `foo` are treated a bit differently for executables
# but not `./foo/bar` and `foo/bar` # but not `./foo/bar` and `foo/bar`
doAssert joinPath(".", "/lib") == unixToNativePath"./lib" doAssert joinPath(".", "/lib") == unixToNativePath"./lib"

30
tests/vm/tvmmisc.nim
View file

@ -376,7 +376,7 @@ block: # VM wrong register free causes errors in unrelated code
in let prc = if not isClosure: bb.sym else: bb[0].sym in let prc = if not isClosure: bb.sym else: bb[0].sym
]# ]#
proc bar2(head: string): string = "asdf" proc bar2(head: string): string = "asdf"
proc gook(u1: int) = discard proc zook(u1: int) = discard
type PathEntry = object type PathEntry = object
kind: int kind: int
@ -385,20 +385,20 @@ block: # VM wrong register free causes errors in unrelated code
iterator globOpt(): int = iterator globOpt(): int =
var u1: int var u1: int
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
gook(u1) zook(u1)
var entry = PathEntry() var entry = PathEntry()
entry.path = bar2("") entry.path = bar2("")