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

find the nodejs binary

Browse source 
upstream calls it node, debian calls it nodejs. We gotta look for both
of them.
This commit is contained in:
Simon Hafner 2015-01-24 18:02:00 -06:00
commit 2beaa7a2da
3 changed files with 13 additions and 5 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)