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

fix testament regression: installed testament works again with testament r path (#16767)

Browse source 
* fix testament regression: installed testament works again with testament r path

* fixup
This commit is contained in:
Timothee Cour 2021-01-20 05:04:08 -08:00 • committed by GitHub
commit 2b5841cd2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
testament/testament.nim
View file

@ -16,6 +16,7 @@ import
from std/sugar import dup
import compiler/nodejs
import lib/stdtest/testutils
from lib/stdtest/specialpaths import splitTestFile
var useColors = true
var backendLogging = true
@ -791,16 +792,9 @@ proc main() =
p.next
processPattern(r, pattern, p.cmdLineRest.string, simulate)
of "r", "run":
# "/pathto/tests/stdlib/nre/captures.nim" -> "stdlib" + "tests/stdlib/nre/captures.nim"
var subPath = p.key.string
let nimRoot = currentSourcePath / "../.."
# makes sure points to this regardless of cwd or which nim is used to compile this.
doAssert(dirExists(nimRoot/testsDir), nimRoot/testsDir & " doesn't exist!") # sanity check
if subPath.isAbsolute: subPath = subPath.relativePath(nimRoot)
# at least one directory is required in the path, to use as a category name
let pathParts = subPath.relativePath(testsDir).split({DirSep, AltSep})
let cat = Category(pathParts[0])
processSingleTest(r, cat, p.cmdLineRest.string, subPath, gTargets, targetsSet)
var subPath = p.key
let (cat, path) = splitTestFile(subPath)
processSingleTest(r, cat.Category, p.cmdLineRest, path, gTargets, targetsSet)
of "html":
generateHtml(resultsFile, optFailing)
else: