From 04bd6c3d9e84645b320e888fa5c547e0b2b1be93 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 6 Jul 2018 14:43:24 +0200 Subject: pkg/instance: pass -os to execprog/fuzzer only for akaros Only akaros needs OS, because the rest assume host OS. But speciying OS for all OSes breaks patch testing on syzbot because old execprog does not have os flag. --- tools/syz-crush/crush.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index bb07b72c3..ee020b74f 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -8,12 +8,12 @@ package main import ( "flag" - "fmt" "io/ioutil" "sync" "sync/atomic" "time" + "github.com/google/syzkaller/pkg/instance" "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" @@ -98,8 +98,8 @@ func runInstance(cfg *mgrconfig.Config, reporter report.Reporter, vmPool *vm.Poo return } - cmd := fmt.Sprintf("%v -executor=%v -repeat=0 -procs=%v -sandbox=%v %v", - execprogBin, executorBin, cfg.Procs, cfg.Sandbox, logFile) + cmd := instance.ExecprogCmd(execprogBin, executorBin, cfg.TargetOS, cfg.TargetArch, cfg.Sandbox, + true, true, true, cfg.Procs, -1, -1, logFile) outc, errc, err := inst.Run(time.Hour, nil, cmd) if err != nil { log.Logf(0, "failed to run execprog: %v", err) -- cgit mrf-deployment