rel_metadata_path_fx for servo

Author: sagudev

moz-webgpu-cts/src/main.rs

@@ -20,7 +20,7 @@ use std::{
     fmt::{self, Debug, Display, Formatter},
     fs,
     hash::Hash,
-    io::{self, BufReader, BufWriter},
+    io::{self, BufReader, BufWriter, Read},
     path::{Path, PathBuf},
     process::ExitCode,
     sync::{mpsc::channel, Arc},
@@ -427,11 +427,13 @@ fn run(cli: Cli) -> ExitCode {
                 .into_par_iter()
                 .for_each_with(exec_reports_sender, |sender, path| {
                     let res = fs::File::open(&path)
-                        .map(BufReader::new)
                         .map_err(Report::msg)
                         .wrap_err("failed to open file")
-                        .and_then(|reader| {
-                            serde_json::from_reader::<_, ExecutionReport>(reader)
+                        .and_then(|mut f| {
+                            let mut s = String::new();
+                            f.read_to_string(&mut s).unwrap();
+                            let first = s.lines().next().unwrap();
+                            serde_json::from_str::<ExecutionReport>(first)
                                 .into_diagnostic()
                                 .wrap_err("failed to parse JSON")
                         })
@@ -713,7 +715,7 @@ fn run(cli: Cli) -> ExitCode {
             let mut files = BTreeMap::<PathBuf, File>::new();
             for (test_path, (properties, subtests)) in recombined_tests_iter {
                 let name = test_path.test_name().to_string();
-                let rel_path = Utf8PathBuf::from(test_path.rel_metadata_path_fx().to_string());
+                let rel_path = Utf8PathBuf::from(test_path.rel_metadata_path_fx(servo).to_string());
                 let path = gecko_checkout.join(&rel_path);
                 let file = files.entry(path).or_insert_with(|| File {
                     properties: file_props_by_file

moz-webgpu-cts/src/shared.rs

@@ -488,17 +488,23 @@ impl<'a> TestPath<'a> {
         })
     }
 
-    pub(crate) fn rel_metadata_path_fx(&self) -> impl Display + '_ {
+    pub(crate) fn rel_metadata_path_fx(&self, servo: bool) -> impl Display + '_ {
         let Self {
             path,
             variant: _,
             scope,
         } = self;
 
-        let scope_dir = match scope {
-            // TODO: servo
-            TestScope::Public => SCOPE_DIR_FX_PUBLIC_COMPONENTS,
-            TestScope::FirefoxPrivate => SCOPE_DIR_FX_PRIVATE_COMPONENTS,
+        let scope_dir = if !servo {
+            match scope {
+                TestScope::Public => SCOPE_DIR_FX_PUBLIC_COMPONENTS,
+                TestScope::FirefoxPrivate => SCOPE_DIR_FX_PRIVATE_COMPONENTS,
+            }
+        } else {
+            match scope {
+                TestScope::Public => SCOPE_DIR_SERVO_PUBLIC_COMPONENTS,
+                TestScope::FirefoxPrivate => todo!(),
+            }
         }
         .iter()
         .chain(&["meta"])