aboutsummaryrefslogtreecommitdiff
path: root/syz-ci
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-11-19 11:58:55 +0100
committerDmitry Vyukov <dvyukov@google.com>2017-11-19 11:58:55 +0100
commit2da09f3c79431a1709c8b9a27e63be94e20b2e9b (patch)
treee61ae06462bc8b0d2c0c5d0eb1c007347a7d4a6d /syz-ci
parente93131fcce06b64b89ccf4fa166b82dec6e7480d (diff)
downloadsyzkaller-2da09f3c79431a1709c8b9a27e63be94e20b2e9b.tar.gz
syz-ci: fix false "no output" during patch testing
Diffstat (limited to 'syz-ci')
-rw-r--r--syz-ci/jobs.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
index db2c96ec0..cccdc8241 100644
--- a/syz-ci/jobs.go
+++ b/syz-ci/jobs.go
@@ -282,10 +282,6 @@ func (job *Job) test() error {
}
Logf(0, "job: testing syzkaller program...")
- testTime := 10 * time.Minute
- if len(req.ReproC) != 0 {
- testTime /= 2
- }
opts, err := csource.DeserializeOptions(req.ReproOpts)
if err != nil {
return err
@@ -304,7 +300,8 @@ func (job *Job) test() error {
" -fault_call=%v -fault_nth=%v -repeat=0 -cover=0 %v",
execprogBin, executorBin, mgrcfg.TargetArch, mgrcfg.Procs, opts.Sandbox,
opts.FaultCall, opts.FaultNth, vmProgFile)
- if crashed, err := job.testProgram(inst, cmdSyz, reporter, testTime); crashed || err != nil {
+ crashed, err := job.testProgram(inst, cmdSyz, reporter, 7*time.Minute)
+ if crashed || err != nil {
return err
}
@@ -326,7 +323,10 @@ func (job *Job) test() error {
if err != nil {
return fmt.Errorf("failed to copy test binary to VM: %v", err)
}
- if crashed, err := job.testProgram(inst, vmBin, reporter, testTime); crashed || err != nil {
+ // We should test for longer (e.g. 5 mins), but the problem is that
+ // reproducer does not print anything, so after 3 mins we detect "no output".
+ crashed, err := job.testProgram(inst, vmBin, reporter, time.Minute)
+ if crashed || err != nil {
return err
}
}