Merge #58

58: Add environment variables to pass additional flags to llvm-cov/llvm-profdata r=taiki-e a=taiki-e

This adds two environment variables:

- `CARGO_LLVM_COV_FLAGS` to pass additional flags to llvm-cov. (value: space-separated list)
- `CARGO_LLVM_PROFDATA_FLAGS` to pass additional flags to llvm-profdata. (value: space-separated list)

Co-authored-by: Taiki Endo <te316e89@gmail.com>

src/env.rs

@@ -8,6 +8,13 @@ use anyhow::Result;
 
 #[derive(Debug)]
 pub(crate) struct Env {
+    /// `CARGO_LLVM_COV_FLAGS` environment variable to pass additional flags
+    /// to llvm-cov. (value: space-separated list)
+    pub(crate) cargo_llvm_cov_flags: Option<String>,
+    /// `CARGO_LLVM_PROFDATA_FLAGS` environment variable to pass additional flags
+    /// to llvm-profdata. (value: space-separated list)
+    pub(crate) cargo_llvm_profdata_flags: Option<String>,
+
     // Environment variables Cargo reads
     // https://doc.rust-lang.org/nightly/cargo/reference/environment-variables.html#environment-variables-cargo-reads
     /// `RUSTFLAGS` environment variable.
@@ -27,11 +34,15 @@ pub(crate) struct Env {
 
 impl Env {
     pub(crate) fn new() -> Result<Self> {
+        let cargo_llvm_cov_flags = ver("CARGO_LLVM_COV_FLAGS")?;
+        let cargo_llvm_profdata_flags = ver("CARGO_LLVM_PROFDATA_FLAGS")?;
         env::remove_var("LLVM_COV_FLAGS");
         env::remove_var("LLVM_PROFDATA_FLAGS");
         env::set_var("CARGO_INCREMENTAL", "0");
 
         Ok(Self {
+            cargo_llvm_cov_flags,
+            cargo_llvm_profdata_flags,
             rustflags: env::var_os("RUSTFLAGS"),
             rustdocflags: env::var_os("RUSTDOCFLAGS"),
             rustc: env::var_os("RUSTC"),

src/main.rs

@@ -165,6 +165,9 @@ fn merge_profraw(cx: &Context) -> Result<()> {
         )
         .arg("-o")
         .arg(&cx.profdata_file);
+    if let Some(flags) = &cx.env.cargo_llvm_profdata_flags {
+        cmd.args(flags.split(' ').filter(|s| !s.trim().is_empty()));
+    }
     if cx.verbose {
         status!("Running", "{:#}", cmd);
     }
@@ -333,6 +336,10 @@ impl Format {
             Format::None => {}
         }
 
+        if let Some(flags) = &cx.env.cargo_llvm_cov_flags {
+            cmd.args(flags.split(' ').filter(|s| !s.trim().is_empty()));
+        }
+
         if let Some(output_path) = &cx.output_path {
             if cx.verbose {
                 status!("Running", "{:#}", cmd);