diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-07-16 11:17:12 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-07-16 11:18:12 +0200 |
| commit | a96368919742ef6c1f80f2e59566a99198c27ea6 (patch) | |
| tree | 0526870930fcda79dff5b47b70f590324c7bb9b1 /pkg/instance/instance.go | |
| parent | 84d08cdf2d65976799e858fd6add094cd462b506 (diff) | |
pkg/log: rename -v to -vv
To avoid conflicts with programs that import both syzkaller packages
and github.com/golang/glog which also defines -v flag.
Diffstat (limited to 'pkg/instance/instance.go')
| -rw-r--r-- | pkg/instance/instance.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 4bd483d61..f46673d47 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -292,8 +292,8 @@ func (inst *inst) testInstance() error { return &TestError{Title: fmt.Sprintf("failed to copy test binary to VM: %v", err)} } - cmd := FuzzerCmd(fuzzerBin, executorBin, "test", inst.cfg.TargetOS, inst.cfg.TargetArch, fwdAddr, - inst.cfg.Sandbox, 0, 0, inst.cfg.Cover, false, true, false) + cmd := OldFuzzerCmd(fuzzerBin, executorBin, "test", inst.cfg.TargetOS, inst.cfg.TargetArch, fwdAddr, + inst.cfg.Sandbox, 0, inst.cfg.Cover, true) outc, errc, err := inst.vm.Run(10*time.Minute, nil, cmd) if err != nil { return fmt.Errorf("failed to run binary in VM: %v", err) @@ -404,10 +404,18 @@ func FuzzerCmd(fuzzer, executor, name, OS, arch, fwdAddr, sandbox string, procs, if runtest { runtestArg = " -runtest" } + verbosityArg := "" + if verbosity != 0 { + verbosityArg = fmt.Sprintf(" -vv=%v", verbosity) + } return fmt.Sprintf("%v -executor=%v -name=%v -arch=%v%v -manager=%v -sandbox=%v"+ - " -procs=%v -v=%d -cover=%v -debug=%v -test=%v%v", + " -procs=%v -cover=%v -debug=%v -test=%v%v%v", fuzzer, executor, name, arch, osArg, fwdAddr, sandbox, - procs, verbosity, cover, debug, test, runtestArg) + procs, cover, debug, test, runtestArg, verbosityArg) +} + +func OldFuzzerCmd(fuzzer, executor, name, OS, arch, fwdAddr, sandbox string, procs int, cover, test bool) string { + return FuzzerCmd(fuzzer, executor, name, OS, arch, fwdAddr, sandbox, procs, 0, cover, false, test, false) } func ExecprogCmd(execprog, executor, OS, arch, sandbox string, repeat, threaded, collide bool, |