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.

1 files changed, 5 insertions, 8 deletions

diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go
index 83eac9bde..4c3f8a93a 100644
--- a/pkg/repro/repro.go
+++ b/pkg/repro/repro.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/google/syzkaller/pkg/csource"
+	instancePkg "github.com/google/syzkaller/pkg/instance"
 	"github.com/google/syzkaller/pkg/log"
 	"github.com/google/syzkaller/pkg/osutil"
 	"github.com/google/syzkaller/pkg/report"
@@ -525,10 +526,6 @@ func (ctx *context) testProgs(entries []*prog.LogEntry, duration time.Duration,
 		return false, fmt.Errorf("failed to copy to VM: %v", err)
 	}
 
-	repeat := 1
-	if opts.Repeat {
-		repeat = 0
-	}
 	if !opts.Fault {
 		opts.FaultCall = -1
 	}
@@ -543,10 +540,10 @@ func (ctx *context) testProgs(entries []*prog.LogEntry, duration time.Duration,
 		}
 		program += "]"
 	}
-	command := fmt.Sprintf("%v -executor=%v -os=%v -arch=%v -cover=0 -procs=%v -repeat=%v"+
-		" -sandbox %v -threaded=%v -collide=%v %v",
-		inst.execprogBin, inst.executorBin, ctx.cfg.TargetOS, ctx.cfg.TargetArch, opts.Procs, repeat,
-		opts.Sandbox, opts.Threaded, opts.Collide, vmProgFile)
+
+	command := instancePkg.ExecprogCmd(inst.execprogBin, inst.executorBin,
+		ctx.cfg.TargetOS, ctx.cfg.TargetArch, opts.Sandbox, opts.Repeat,
+		opts.Threaded, opts.Collide, opts.Procs, -1, -1, vmProgFile)
 	ctx.reproLog(2, "testing program (duration=%v, %+v): %s", duration, opts, program)
 	return ctx.testImpl(inst.Instance, command, duration)
 }