diff options
Diffstat (limited to 'adapters/bash')
| -rw-r--r-- | adapters/bash/adapter.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/adapters/bash/adapter.go b/adapters/bash/adapter.go index 65a6c80..8c7713c 100644 --- a/adapters/bash/adapter.go +++ b/adapters/bash/adapter.go @@ -15,7 +15,8 @@ import ( ) type Adapter struct { - dirs planr.DirConfig + dirs planr.DirConfig + buildDir string } func (a *Adapter) Config() planr.AdapterConfig { @@ -36,13 +37,14 @@ func safeWd() string{ return wd } -func (a *Adapter) Init(dirs planr.DirConfig) { - a.dirs = dirs +func (a *Adapter) Init(ctx planr.PipelineContext) { + a.dirs = ctx.Dirs + a.buildDir = ctx.AdapterDir } func (adapter Adapter) Build(tcs []planr.TestCase) { } -func executeScriptedTest(testdir string, tc planr.TestCase) planr.TestResult { +func executeScriptedTest(builddir, testdir string, tc planr.TestCase) planr.TestResult { cfg := tc.AdapterConfig().(*Config) timeout := time.Duration(cfg.Timeout) * time.Millisecond @@ -57,6 +59,8 @@ func executeScriptedTest(testdir string, tc planr.TestCase) planr.TestResult { result.Tc = tc cmd := exec.CommandContext(ctx, "bash", path) + + cmd.Dir = builddir if out, err := cmd.CombinedOutput(); err != nil { result.Status = planr.RUNTIME_FAILURE @@ -87,7 +91,7 @@ func (adapter Adapter) Evaluate(tcs []planr.TestCase) [] planr.TestResult { c := make(chan planr.TestResult, 0) for i := range tcs { go func(i int) { - c <- executeScriptedTest(adapter.dirs.Tests(), tcs[i]) + c <- executeScriptedTest(adapter.buildDir, adapter.dirs.Tests(), tcs[i]) }(i) } |