aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-11-08 17:48:15 +0100
committerDmitry Vyukov <dvyukov@google.com>2017-11-08 18:01:43 +0100
commite0a2b1953bbae62ca70723be7a152ac6dda7cb5f (patch)
treea25f76756ab2e8d1baa7b02aff352deba020b63a /vm
parent3b7ad24d6cd0566c2f307ab62c78ffdd4f76de3d (diff)
vm: merge "not executing programs" into "no output"
Frequently it's the same condition. In one case there is just a stray error message on console that turns the crash into "not executing programs". While in another case there is no stray message, and then it's detected as "no output".
Diffstat (limited to 'vm')
-rw-r--r--vm/vm.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/vm/vm.go b/vm/vm.go
index 764126d30..56fca1857 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -185,10 +185,12 @@ func MonitorExecution(outc <-chan []byte, errc <-chan error, needOutput bool,
if matchPos < 0 {
matchPos = 0
}
- // In some cases kernel constantly prints something to console,
+ // In some cases kernel episodically prints something to console,
// but fuzzer is not actually executing programs.
+ // We intentionally produce the same title as no output at all,
+ // because frequently it's the same condition.
if time.Since(lastExecuteTime) > 3*time.Minute {
- return "test machine is not executing programs", nil, output, true, false
+ return "no output from test machine", nil, output, true, false
}
case <-ticker.C:
tickerFired = true