diff options
author | flu0r1ne <flu0r1ne@flu0r1ne.net> | 2021-09-06 14:36:18 -0500 |
---|---|---|
committer | flu0r1ne <flu0r1ne@flu0r1ne.net> | 2021-09-06 14:36:18 -0500 |
commit | 989412cd49c4d922d2a6fdcebb1c51fbc91bc066 (patch) | |
tree | ddcf528afbfb5f0720884b223674913ea6ce15d1 /runner.go | |
parent | 5a5c9d98ea15ac15a86901808ac4b966fec5e012 (diff) | |
parent | 7343fd274c37246ba449550cf29f638351794ba4 (diff) | |
download | deb-planr-989412cd49c4d922d2a6fdcebb1c51fbc91bc066.tar.xz deb-planr-989412cd49c4d922d2a6fdcebb1c51fbc91bc066.zip |
Merge branch 'upstream' into ppa
Update v0.1.2
Diffstat (limited to 'runner.go')
-rw-r--r-- | runner.go | 29 |
1 files changed, 17 insertions, 12 deletions
@@ -29,17 +29,19 @@ func (r Runner) checkConfig(tcs []TestCase) { } } -func (r Runner) setupEnv(adapter Adapter) { - nm := adapter.Config().Name - wd := path.Join(r.dirs.Build(), nm) +func adapterBuildDir(dirs DirConfig, adapter Adapter) string { + return path.Join(dirs.Build(), adapter.Config().Name) +} + +func (r Runner) createAdapterBuildDir(adapter Adapter) { + build := adapterBuildDir(r.dirs, adapter) - if !directoryExists(wd) { - if err := os.Mkdir(wd, 0755); err != nil { - log.Fatalf("Could not create adapter config %s %v\n", wd, err) + if !directoryExists(build) { + if err := os.Mkdir(build, 0755); err != nil { + log.Fatalf("Could not create adapter config %s %v\n", build, err) } } - safeCd(wd) } type adapterTestSet struct { @@ -101,12 +103,10 @@ func (r Runner) Build(tcs []TestCase) { adapter := pair.adapter cases := pair.tcs - r.setupEnv(adapter) + r.createAdapterBuildDir(adapter) adapter.Build(cases) } - - safeCd(r.dirs.Config()) } func (r Runner) Evaluate(tcs []TestCase) []TestResult { @@ -119,7 +119,6 @@ func (r Runner) Evaluate(tcs []TestCase) []TestResult { adapter := pair.adapter cases := pair.tcs - r.setupEnv(adapter) resultSet := adapter.Evaluate(cases) c <- resultSet @@ -155,9 +154,15 @@ func (r Runner) SrcDir() string { func NewRunner(adapters map[string]Adapter, dirs DirConfig) Runner { r := Runner{adapters, dirs} + for _, adapter := range r.adapters { - adapter.Init(dirs) + ctx := PipelineContext { + Dirs: dirs, + AdapterDir: adapterBuildDir(dirs, adapter), + } + + adapter.Init(ctx) } return r |