WIP: feat: tags property on tests and subtests

erichdongubler-mozilla · Aug 3, 2024 · 64263d1 · 64263d1
1 parent 76b84db
commit 64263d1
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 2 deletions.
diff --git a/moz-webgpu-cts/src/main.rs b/moz-webgpu-cts/src/main.rs
@@ -579,6 +579,7 @@ fn run(cli: Cli) -> ExitCode {
                     is_disabled,
                     expected,
                     implementation_status: _,
+                    tags: _,
                 } = properties;
 
                 let test_name = Arc::new(test_name);
@@ -703,6 +704,7 @@ fn run(cli: Cli) -> ExitCode {
                         is_disabled,
                         expected,
                         implementation_status: _,
+                        tags: _,
                     } = properties;
 
                     if is_disabled {

diff --git a/moz-webgpu-cts/src/wpt/metadata.rs b/moz-webgpu-cts/src/wpt/metadata.rs
@@ -196,6 +196,32 @@ impl<'a> Properties<'a> for FileProps {
     }
 }
 
+fn tags_parser<'a>(
+    helper: &mut PropertiesParseHelper<'a>,
+    conditional_term: impl Parser<'a, &'a str, Expr<Value<'static>>, ParseError<'a>>,
+) -> impl Parser<'a, &'a str, PropertyValue<Expr<Value<'static>>, Vec<String>>, ParseError<'a>> {
+    helper
+        .parser(
+            keyword("tags").to(()),
+            conditional_term,
+            ascii::ident()
+                .map(|i: &str| i.to_owned())
+                .separated_by(just(',').padded_by(inline_whitespace()))
+                .collect()
+                .delimited_by(
+                    just('[').padded_by(inline_whitespace()),
+                    just(']').padded_by(inline_whitespace()),
+                )
+                .validate(|idents: Vec<_>, e, emitter| {
+                    if idents.is_empty() {
+                        emitter.emit(Rich::custom(e.span(), "no tags specified"));
+                    }
+                    idents
+                }),
+        )
+        .map(|((), tags)| tags)
+}
+
 #[test]
 fn file_props() {
     let parser = FileProps::property_parser(&mut PropertiesParseHelper::new(0));
@@ -740,7 +766,7 @@ fn format_test_properties<Out>(indentation: u8, property: &TestProps<Out>) -> im
 where
     Out: Default + Display + EnumSetType + Eq + PartialEq,
 {
-    lazy_format!(move |f| {
+    let display = lazy_format!(move |f| {
         let indent = lazy_format!(move |f| write!(
             f,
             "{}",
@@ -752,6 +778,7 @@ where
             is_disabled,
             expected,
             implementation_status,
+            tags,
         } = property;
 
         if *is_disabled {
@@ -832,6 +859,20 @@ where
             Ok(())
         }
 
+        if let Some(tags) = tags {
+            #[derive(Clone, Debug, Default, Eq, PartialEq)]
+            struct TagsDisplay();
+
+            impl Display for TagsDisplay {
+                fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+                    let Self(tags) = self;
+                    Display::fmt(&tags.iter().join_with(", "), f)
+                }
+            }
+
+            write_normalized(f, &indent, TAGS_IDENT, &tags.map(TagsDisplay))?;
+        }
+
         if let Some(implementation_status) = implementation_status {
             write_normalized(
                 f,
@@ -846,7 +887,8 @@ where
         }
 
         Ok(())
-    })
+    });
+    display
 }
 
 #[derive(Clone, Copy, Debug, Enum, EnumIter, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
@@ -870,6 +912,7 @@ where
     pub is_disabled: bool,
     pub expected: Option<ExpandedPropertyValue<Expected<Out>>>,
     pub implementation_status: Option<ExpandedPropertyValue<ImplementationStatus>>,
+    pub tags: Option<ExpandedPropertyValue<Vec<String>>>,
 }
 
 impl<'a, Out> TestProps<Out>
@@ -881,6 +924,7 @@ where
             is_disabled,
             expected,
             implementation_status,
+            tags,
         } = self;
 
         let TestProp { kind, span } = prop;
@@ -959,6 +1003,7 @@ where
                 implementation_status,
                 val,
             ),
+            TestPropKind::Tags(val) => conditional(emitter, span, TAGS_IDENT, tags, val),
         }
     }
 }
@@ -986,6 +1031,7 @@ where
     Expected(PropertyValue<Applicability, Expected<Out>>),
     Disabled,
     ImplementationStatus(PropertyValue<Applicability, ImplementationStatus>),
+    Tags(PropertyValue<Applicability, Vec<String>>),
 }
 
 impl<Out> TestProp<Out>
@@ -1175,6 +1221,7 @@ where
 }
 
 pub(crate) const EXPECTED_IDENT: &str = "expected";
+pub(crate) const TAGS_IDENT: &str = "expected";
 pub(crate) const PASS: &str = "PASS";
 pub(crate) const FAIL: &str = "FAIL";
 pub(crate) const NOTRUN: &str = "NOTRUN";