Skip to content

Fix broken-pipe-no-ice run-make test for rpath-less builds #140744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix broken-pipe-no-ice run-make test for rpath-less builds #140744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tests/run-make/broken-pipe-no-ice/rmake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// strange.

use std::io::Read;
use std::path::PathBuf;
use std::process::{Command, Stdio};

use run_make_support::env_var;
Expand Down Expand Up @@ -67,11 +68,21 @@ fn check_broken_pipe_handled_gracefully(bin: Binary, mut cmd: Command) {
}

fn main() {
// We need to set the runtime libs for rpath-less rustc. This mirrors the logic
// in run-make-support::util::set_host_compiler_dylib_path
let ld_lib_path_envvar = env_var("LD_LIB_PATH_ENVVAR");
let mut paths =
vec![std::env::current_dir().unwrap(), PathBuf::from(env_var("HOST_RUSTC_DYLIB_PATH"))];
paths.extend(std::env::split_paths(&env_var(&ld_lib_path_envvar)));
let ld_path = std::env::join_paths(paths.iter()).unwrap();

let mut rustc = Command::new(env_var("RUSTC"));
rustc.arg("--print=sysroot");
rustc.env(&ld_lib_path_envvar, ld_path.clone());
check_broken_pipe_handled_gracefully(Binary::Rustc, rustc);

let mut rustdoc = Command::new(env_var("RUSTDOC"));
rustdoc.arg("--version");
rustdoc.env(&ld_lib_path_envvar, ld_path.clone());
check_broken_pipe_handled_gracefully(Binary::Rustdoc, rustdoc);
}
Loading