From 34f2c2332bedc41c5d22eaa35a555720cae3a1c7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 29 Nov 2017 13:23:42 +0100 Subject: pkg/report: add Output to Report Whole raw output is indivisble part of Report, currently we always pass Output separately along with Report. Make Output a Report field. Then, put whole Report into manager Crash and repro context and Result. There is little point in passing Report as aa bunch of separate fields. --- tools/syz-crush/crush.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index 1d858790b..ca92f8cd1 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -109,7 +109,7 @@ func runInstance(cfg *mgrconfig.Config, reporter report.Reporter, vmPool *vm.Poo } log.Logf(0, "vm-%v: crushing...", index) - rep, output := vm.MonitorExecution(outc, errc, reporter, false) + rep := vm.MonitorExecution(outc, errc, reporter, false) if rep == nil { // This is the only "OK" outcome. log.Logf(0, "vm-%v: running long enough, restarting", index) @@ -121,7 +121,7 @@ func runInstance(cfg *mgrconfig.Config, reporter report.Reporter, vmPool *vm.Poo } defer f.Close() log.Logf(0, "vm-%v: crashed: %v, saving to %v", index, rep.Title, f.Name()) - f.Write(output) + f.Write(rep.Output) } return } -- cgit mrf-deployment