unrejigger

Author: andyleiserson

xtask/src/cts.rs

@@ -34,7 +34,7 @@ use anyhow::{anyhow, bail, Context};
 use core::fmt;
 use pico_args::Arguments;
 use regex_lite::{Regex, RegexBuilder};
-use std::{ffi::OsString, sync::LazyLock};
+use std::{ffi::OsString, path::Path, sync::LazyLock};
 use xshell::Shell;
 
 use crate::util::{git_version_at_least, parse_binary_from_cargo_json};
@@ -319,7 +319,8 @@ pub fn run_cts(
     }
 
     let env_vars = if llvm_cov {
-        let env = shell
+        let mut dir = None;
+        let mut vec = shell
             .cmd("cargo")
             .args(&["llvm-cov", "--no-cfg-coverage", "show-env"])
             .read()
@@ -335,9 +336,23 @@ pub fn run_cts(
             })
             .map(|(key, value)| {
                 let value = value.trim_matches('"').trim_matches('\'');
-                (key.to_string(), value.to_string())
+
+                let key = if key == "CARGO_LLVM_COV_TARGET_DIR" {
+                    // TODO comment here
+                    let key = Path::new(key).join("llvm-cov-target").into_os_string().into_string().unwrap();
+                    dir = Some(key.clone());
+                    key
+                } else {
+                    key.to_string()
+                };
+
+                (key, value.to_string())
             })
-            .collect::<Vec<_>>()
+            .collect::<Vec<_>>();
+
+        vec.push(("CARGO_LLVM_COV_BUILD_DIR".into(), dir.take().unwrap()));
+
+        let env = vec
             .into_iter();
 
         // The cargo-llvm-cov docs specify to clean after setting the
@@ -393,11 +408,22 @@ pub fn run_cts(
             log::info!("Running {}", test.selector.to_string_lossy());
         }
 
-        let cmd = shell
-            .cmd(&bin)
-            .envs(env_vars.clone())
-            .args(cts_bin)
-            .args([&test.selector]);
+        let cmd = if test.selector != "webgpu:shader,execution,expression,call,builtin,textureSample:sampled_1d_coords:*" {
+            shell
+                .cmd(&bin)
+                .envs(env_vars.clone())
+                .args(cts_bin)
+                .args([&test.selector])
+
+        } else {
+            shell
+                .cmd("cargo")
+                .args(&["llvm-cov", "--no-cfg-coverage", "--no-report", "run"])
+                .args(&cargo_opts)
+                .arg("--")
+                .args(cts_bin)
+                .arg(&test.selector)
+        };
 
         match output_filter {
             PrintOutputWhen::TestFails => {