diff options
| -rw-r--r-- | dashboard/app/bisect_test.go | 4 | ||||
| -rw-r--r-- | dashboard/app/bug.html | 4 | ||||
| -rw-r--r-- | dashboard/app/templates.html | 19 |
3 files changed, 15 insertions, 12 deletions
diff --git a/dashboard/app/bisect_test.go b/dashboard/app/bisect_test.go index e4362ae8a..3de8254f7 100644 --- a/dashboard/app/bisect_test.go +++ b/dashboard/app/bisect_test.go @@ -976,9 +976,9 @@ func TestBugBisectionResults(t *testing.T) { url := fmt.Sprintf("/bug?id=%v", keys[0].StringID()) content, err := c.httpRequest("GET", url, "", AccessAdmin) c.expectEQ(err, nil) - c.expectTrue(bytes.Contains(content, []byte("Bisection: introduced by"))) + c.expectTrue(bytes.Contains(content, []byte("Cause bisection: introduced by"))) c.expectTrue(bytes.Contains(content, []byte("kernel: add a bug"))) - c.expectTrue(bytes.Contains(content, []byte("Bisection: fixed by"))) + c.expectTrue(bytes.Contains(content, []byte("Fix bisection: fixed by"))) c.expectTrue(bytes.Contains(content, []byte("kernel: add a fix"))) } diff --git a/dashboard/app/bug.html b/dashboard/app/bug.html index e09ed7e98..082238ea9 100644 --- a/dashboard/app/bug.html +++ b/dashboard/app/bug.html @@ -23,9 +23,9 @@ Page with details about a single bug. Patched on: {{.Bug.PatchedOn}}, missing on: {{.Bug.MissingOn}}<br> {{end}} {{end}} - First crash: {{formatLateness $.Now $.Bug.FirstTime}}, last: {{formatLateness $.Now $.Bug.LastTime}}<br> + First crash: {{formatLateness $.Now $.Bug.FirstTime}}, last: {{formatLateness $.Now $.Bug.LastTime}}<br><br> - {{template "bisect_results" .BisectCause}} + {{template "bisect_results" .BisectCause}}<br> {{template "bisect_results" .BisectFix}} {{template "bug_list" .DupOf}} diff --git a/dashboard/app/templates.html b/dashboard/app/templates.html index 57a38ca9a..80f27e7c2 100644 --- a/dashboard/app/templates.html +++ b/dashboard/app/templates.html @@ -239,13 +239,17 @@ Use of this source code is governed by Apache 2 LICENSE that can be found in the {{$causeJob := 1}} {{$fixJob := 2}} {{if .ErrorLink}} - <b>Bisection: {{link .ErrorLink "error"}} + {{if eq .Type $causeJob}} + <b>Cause bisection: failed</b> + {{else if eq .Type $fixJob}} + <b>Fix bisection: failed</b> + {{end}} ({{link .LogLink "bisect log"}})</b><br> {{else if .Commit}} {{if eq .Type $causeJob}} - <b>Bisection: introduced by</b> + <b>Cause bisection: introduced by</b> {{else if eq .Type $fixJob}} - <b>Bisection: fixed by</b> + <b>Fix bisection: fixed by</b> {{end}} <b>({{link .LogLink "bisect log"}}):</b><br> <br><span class="mono"> @@ -257,9 +261,9 @@ Use of this source code is governed by Apache 2 LICENSE that can be found in the </span><br> {{else if .Commits}} {{if eq .Type $causeJob}} - <b>Bisection: the cause commit could be any of</b> + <b>Cause bisection: the cause commit could be any of</b> {{else if eq .Type $fixJob}} - <b>Bisection: the fix commit could be any of</b> + <b>Fix bisection: the fix commit could be any of</b> {{end}} <b>({{link .LogLink "bisect log"}}):</b><br> <br><span class="mono"> @@ -269,13 +273,12 @@ Use of this source code is governed by Apache 2 LICENSE that can be found in the </span> {{else}} {{if eq .Type $causeJob}} - <b>Bisection: the bug happens on the oldest tested release</b> + <b>Cause bisection: the bug happens on the oldest tested release</b> {{else if eq .Type $fixJob}} - <b>Bisection: the bug occurs on the latest tested release</b> + <b>Fix bisection: the bug occurs on the latest tested release</b> {{end}} <br> {{end}} - Tree: <span title="{{.Manager}}">{{.KernelAlias}}</span><br> {{if .CrashLogLink}} Crash: {{link .CrashReportLink .CrashTitle}} ({{link .CrashLogLink "log"}})<br> Repro: {{optlink .Crash.ReproCLink "C"}} |