Support dependencies during cross compilation

Author: oli-obk

tests/compiletest.rs

@@ -65,6 +65,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         dependency_builder: Some((
             std::env::current_dir()?.join("miri"),
             vec!["cargo".to_string()],
+            vec![("MIRI_SYSROOT".to_string(), std::env::var("MIRI_SYSROOT").unwrap())],
         )),
     };
     ui_test::run_tests(config)

ui_test/src/dependencies.rs

@@ -1,4 +1,4 @@
-use color_eyre::eyre::{ensure, Result};
+use color_eyre::eyre::{bail, Result};
 use std::{
     path::{Path, PathBuf},
     process::Command,
@@ -12,13 +12,14 @@ pub fn build_dependencies(config: &Config) -> Result<Vec<(String, PathBuf)>> {
         Some(path) => path,
         None => return Ok(vec![]),
     };
-    let (program, args): (&Path, &[_]) = match &config.dependency_builder {
-        Some((path, args)) => (path, args),
-        None => (Path::new("cargo"), &[]),
+    let (program, args, envs): (&Path, &[_], &[_]) = match &config.dependency_builder {
+        Some((path, args, envs)) => (path, args, envs),
+        None => (Path::new("cargo"), &[], &[]),
     };
     let mut build = Command::new(program);
     build.env_clear();
     build.env("PATH", std::env::var_os("PATH").unwrap());
+    build.envs(envs.iter().map(|(k, v)| (k, v)));
     build.args(args);
     build.arg("run");
     if let Some(target) = &config.target {
@@ -32,7 +33,12 @@ pub fn build_dependencies(config: &Config) -> Result<Vec<(String, PathBuf)>> {
 
     let output = build.output()?;
 
-    ensure!(output.status.success(), "{output:#?}");
+    if !output.status.success() {
+        let stdout = String::from_utf8(output.stdout)?;
+        let stderr = String::from_utf8(output.stderr)?;
+        bail!("failed to compile dependencies:\nstderr:\n{stderr}\n\nstdout:{stdout}");
+    }
+
     let output = output.stdout;
     let output = String::from_utf8(output)?;
     Ok(output

ui_test/src/lib.rs

@@ -44,7 +44,7 @@ pub struct Config {
     pub manifest_path: Option<PathBuf>,
     /// Can be used to override what command to run instead of `cargo` to build the
     /// dependencies in `manifest_path`
-    pub dependency_builder: Option<(PathBuf, Vec<String>)>,
+    pub dependency_builder: Option<(PathBuf, Vec<String>, Vec<(String, String)>)>,
 }
 
 #[derive(Debug)]