Fixes go test failures and issues from dawn/98241.

Change-Id: Idf4f47eba595dcf3f2c44b5f73179b2773a68aef
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/98761
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Loko Kung 2022-08-11 07:50:21 +00:00 committed by Dawn LUCI CQ
parent 3abad2c125
commit 0d3a7bbd7e
2 changed files with 6 additions and 5 deletions

View File

@ -81,6 +81,7 @@ type Expectation struct {
Comment string // Optional comment at end of line Comment string // Optional comment at end of line
} }
// Expectations are a list of Expectation
type Expectations []Expectation type Expectations []Expectation
// Load loads the expectation file at 'path', returning a Content. // Load loads the expectation file at 'path', returning a Content.

View File

@ -169,8 +169,8 @@ a:b,c:* [ Failure ]
{ ////////////////////////////////////////////////////////////////////// { //////////////////////////////////////////////////////////////////////
name: "simple expectation with tags", name: "simple expectation with tags",
expectations: ` expectations: `
[ os-a ] a:b,c:* [ Failure ]
[ gpu-b ] a:b,c:* [ Failure ] [ gpu-b ] a:b,c:* [ Failure ]
[ os-a ] a:b,c:* [ Failure ]
`, `,
results: result.List{ results: result.List{
result.Result{ result.Result{
@ -186,7 +186,7 @@ a:b,c:* [ Failure ]
{ {
Severity: expectations.Error, Severity: expectations.Error,
Line: headerLines + 3, Line: headerLines + 3,
Message: "[gpu-b] a:b,c:* collides with expectation at line 8", Message: "[os-a] a:b,c:* collides with expectation at line 8",
}, },
}, },
}, },
@ -219,8 +219,8 @@ a:b,c:* [ Failure ]
{ ////////////////////////////////////////////////////////////////////// { //////////////////////////////////////////////////////////////////////
name: "collision with child-expectation", name: "collision with child-expectation",
expectations: ` expectations: `
a:b:x:* [ Failure ] crbug.com/a/1 a:b:x:* [ Failure ]
a:b:* [ Failure ] crbug.com/a/2 a:b:* [ Failure ]
`, `,
results: result.List{ results: result.List{
result.Result{ result.Result{
@ -235,7 +235,7 @@ a:b:* [ Failure ]
}, },
}, },
updated: ` updated: `
a:b:x:* [ Failure ] crbug.com/a/1 a:b:x:* [ Failure ]
# New failures. Please triage: # New failures. Please triage:
crbug.com/dawn/0000 a:b:y:* [ Failure ] crbug.com/dawn/0000 a:b:y:* [ Failure ]