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

Merge pull request #2017 from reactormonk/nodejs-binary

Browse source 
Algorithm to find the nodejs binary
This commit is contained in:
Andreas Rumpf 2015-01-28 15:14:39 +01:00
commit 190cc01f24
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/testament/tester.nim
View file

@ -12,7 +12,7 @@
import
parseutils, strutils, pegs, os, osproc, streams, parsecfg, json,
marshal, backend, parseopt, specs, htmlgen, browsers, terminal,
algorithm
algorithm, nodejs
const
resultsFile = "testresults.html"
@ -187,12 +187,13 @@ proc testSpec(r: var TResults, test: TTest) =
else:
exeFile = changeFileExt(tname, ExeExt)
if existsFile(exeFile):
if test.target == targetJS and findExe("nodejs") == "":
let nodejs = findNodeJs()
if test.target == targetJS and nodejs == "":
r.addResult(test, expected.outp, "nodejs binary not in PATH",
reExeNotFound)
return
var (buf, exitCode) = execCmdEx(
(if test.target == targetJS: "nodejs " else: "") & exeFile)
(if test.target == targetJS: nodejs & " " else: "") & exeFile)
if exitCode != expected.exitCode:
r.addResult(test, "exitcode: " & $expected.exitCode,
"exitcode: " & $exitCode, reExitCodesDiffer)