Replaces dirname with osproc.parentDir.

This commit is contained in:
Grzegorz Adam Hankiewicz 2013-06-07 18:51:52 +02:00
commit 9b0e03cb2e

View file

@ -26,15 +26,13 @@ type
TNimrodSession* = object TNimrodSession* = object
nim: PProcess nim: PProcess
proc dirname(path: string): string = path.splitPath()[0]
var var
TesterDir = getAppDir() TesterDir = getAppDir()
NimrodBin = TesterDir / "../bin/nimrod" NimrodBin = TesterDir / "../bin/nimrod"
proc startNimrodSession*(project: string): TNimrodSession = proc startNimrodSession*(project: string): TNimrodSession =
result.nim = startProcess(NimrodBin, result.nim = startProcess(NimrodBin,
workingDir = project.dirname, workingDir = project.parentDir,
args = ["serve", "--server.type:stdin", project]) args = ["serve", "--server.type:stdin", project])
proc doCommand*(session: var TNimrodSession, command: string): string = proc doCommand*(session: var TNimrodSession, command: string): string =
@ -63,7 +61,7 @@ proc doScenario(script: string, output: PStream): bool =
if f.readLine(project): if f.readLine(project):
var var
s = startNimrodSession(script.dirname / project.string) s = startNimrodSession(script.parentDir / project.string)
tline = TaintedString("") tline = TaintedString("")
lastOutput = "" lastOutput = ""
ln = 1 ln = 1