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

fix #16330 tshould_not_work (#16342)

Browse source
This commit is contained in:
Timothee Cour 2020-12-14 02:37:27 -08:00 • committed by GitHub
commit 555cfd1d59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testament/testament.nim
View file

@ -144,7 +144,7 @@ proc prepareTestArgs(cmdTemplate, filename, options, nimcache: string,
options.add " " & extraOptions options.add " " & extraOptions
result = parseCmdLine(cmdTemplate % ["target", targetToCmd[target], result = parseCmdLine(cmdTemplate % ["target", targetToCmd[target],
"options", options, "file", filename.quoteShell, "options", options, "file", filename.quoteShell,
"filedir", filename.getFileDir()]) "filedir", filename.getFileDir(), "nim", compilerPrefix])
proc callCompiler(cmdTemplate, filename, options, nimcache: string, proc callCompiler(cmdTemplate, filename, options, nimcache: string,
target: TTarget, extraOptions = ""): TSpec = target: TTarget, extraOptions = ""): TSpec =
@ -682,7 +682,7 @@ proc main() =
gTargets = parseTargets(targetsStr) gTargets = parseTargets(targetsStr)
targetsSet = true targetsSet = true
of "nim": of "nim":
compilerPrefix = addFileExt(p.val.string, ExeExt) compilerPrefix = addFileExt(p.val.string.absolutePath, ExeExt)
of "directory": of "directory":
setCurrentDir(p.val.string) setCurrentDir(p.val.string)
of "colors": of "colors":

4
tests/testament/tshould_not_work.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
cmd: "testament/testament --directory:testament --colors:off --backendLogging:off --nim:../compiler/nim category shouldfail" cmd: "testament/testament --directory:testament --colors:off --backendLogging:off --nim:$nim category shouldfail"
action: compile action: compile
nimout: ''' nimout: '''
FAIL: tests/shouldfail/tccodecheck.nim c FAIL: tests/shouldfail/tccodecheck.nim c
@ -35,5 +35,3 @@ FAIL: tests/shouldfail/tvalgrind.nim c
Failure: reExitcodesDiffer Failure: reExitcodesDiffer
''' '''
""" """
# xxx `--nim:../compiler/nim`, doesn't seem correct (and should also honor `testament --nim`)