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

fix js category

Browse source
This commit is contained in:
Arne Döring 2018-11-28 09:43:22 +01:00 • committed by Araq
commit 465e742182
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
testament/tester.nim
View file

@ -384,7 +384,7 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
let isJsTarget = target == targetJS let isJsTarget = target == targetJS
var exeFile: string var exeFile: string
if isJsTarget: if isJsTarget:
let file = changeFileExt(test.name, "js") let file = test.name.lastPathPart.changeFileExt("js")
exeFile = nimcacheDir(test.name, test.options, target) / file exeFile = nimcacheDir(test.name, test.options, target) / file
else: else:
exeFile = changeFileExt(test.name, ExeExt) exeFile = changeFileExt(test.name, ExeExt)
@ -428,8 +428,8 @@ proc testSpec(r: var TResults, test: TTest, targets: set[TTarget] = {}) =
bufB, reExitCodesDiffer) bufB, reExitCodesDiffer)
continue continue
if (expected.outputCheck == ocEqual and bufB != expected.outp) or if (expected.outputCheck == ocEqual and expected.outp != bufB) or
(expected.outputCheck == ocSubstr and bufB notin expected.outp): (expected.outputCheck == ocSubstr and expected.outp notin bufB):
given.err = reOutputsDiffer given.err = reOutputsDiffer
r.addResult(test, target, expected.outp, bufB, reOutputsDiffer) r.addResult(test, target, expected.outp, bufB, reOutputsDiffer)
continue continue

3
tests/js/t7224.nim
View file

@ -7,7 +7,7 @@ t7224.ccc, line: 15
t7224.ddd, line: 12 t7224.ddd, line: 12
''' '''
""" """
proc ddd() = proc ddd() =
raise newException(IOError, "didn't do stuff") raise newException(IOError, "didn't do stuff")
@ -22,5 +22,6 @@ proc aaa() =
try: try:
aaa() aaa()
except IOError as e: except IOError as e:
echo getStackTrace(e) echo getStackTrace(e)