Skip to content

Commit 18f5a55

Browse files
feat: support non-true disabled strings
1 parent 565a986 commit 18f5a55

4 files changed

Lines changed: 234 additions & 65 deletions

File tree

moz-webgpu-cts/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ serde = { workspace = true, features = ["derive"] }
3636
serde_json = "1.0.107"
3737
strum = { version = "0.25.0", features = ["derive"] }
3838
thiserror = { workspace = true }
39-
wax = { version = "0.6.0", features = ["miette"], git = "https://github.com/ErichDonGubler/wax", branch = "static-miette-diags"}
40-
whippit = { version = "0.6.2", path = "../whippit", default-features = false, features = ["serde1"] }
39+
wax = { version = "0.6.0", features = [
40+
"miette",
41+
], git = "https://github.com/ErichDonGubler/wax", branch = "static-miette-diags" }
42+
whippit = { version = "0.6.2", path = "../whippit", default-features = false, features = [
43+
"serde1",
44+
] }
4145
enum-map = { version = "2.7.3", features = ["serde"] }
4246

4347
[dev-dependencies]

moz-webgpu-cts/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,15 +608,15 @@ fn run(cli: Cli) -> ExitCode {
608608
} = test;
609609

610610
let TestProps {
611-
is_disabled,
611+
disabled,
612612
expected,
613613
implementation_status: _,
614614
tags: _,
615615
} = properties;
616616

617617
let test_name = Arc::new(test_name);
618618

619-
if is_disabled {
619+
if disabled.is_some_and(|d| d.iter().any(|(_, val)| val.is_disabled())) {
620620
analysis.for_each_platform_mut(|analysis| {
621621
analysis
622622
.tests_with_disabled_or_skip
@@ -733,13 +733,13 @@ fn run(cli: Cli) -> ExitCode {
733733

734734
let Subtest { properties } = subtest;
735735
let TestProps {
736-
is_disabled,
736+
disabled,
737737
expected,
738738
implementation_status: _,
739739
tags: _,
740740
} = properties;
741741

742-
if is_disabled {
742+
if disabled.is_some_and(|d| d.iter().any(|(_, val)| val.is_disabled())) {
743743
analysis
744744
.windows
745745
.tests_with_disabled_or_skip

0 commit comments

Comments
 (0)