diff --git a/make_tool.cue b/make_tool.cue index 613ea20..5875410 100644 --- a/make_tool.cue +++ b/make_tool.cue @@ -75,12 +75,17 @@ task: run: { mklog: file.Create & {filename: "\(vars.testdir)/xtemplate.log", contents: ""} ready: exec.Run & { - $dep: mklog.$done + $after: mklog cmd: ["bash", "-c", "grep 'starting server' <(tail -f \(mklog.filename))"] } + display: exec.Run & { + $after: mklog + cmd: ["echo", "grep 'starting server' <(tail -f \(mklog.filename))"] + } + start: exec.Run & { - $dep: mkdataw.$done && mklog.$done && gobuild.$done + $after: [mkdataw, mklog, gobuild] cmd: ["bash", "-c", "./xtemplate --loglevel -4 -d DB:sql:sqlite3:file:./dataw/test.sqlite -d FS:fs:./data --config-file config.json >\(mklog.filename) 2>&1"] dir: vars.testdir } @@ -185,7 +190,7 @@ command: ci: { gotest: task.gotest & {"vars": cfg.vars} - run: task.run & {"vars": cfg.vars} + run: task.run & {"vars": cfg.vars, start: mustSucceed: true} test: task.test & {"vars": cfg.vars, hurl: $dep: run.ready.$done} kill: exec.Run & {cmd: "pkill xtemplate", $dep: test.hurl.$done} // better way?