Skip to content

Commit

Permalink
Rollup merge of rust-lang#81456 - Amanieu:remote-test-server, r=Amanieu
Browse files Browse the repository at this point in the history
Make remote-test-server easier to use with new targets

While testing rust-lang#81455 I encountered 2 issues with `remote-test-server`:
- It is built with the stage 0 toolchain, which does not support a newly added target.
- It overwrites `LD_LIBRARY_PATH` instead of appending to it, which prevents the use of a custom sysroot for target libraries.
  • Loading branch information
m-ou-se authored Feb 5, 2021
2 parents d71f741 + b5482a8 commit f0cd2e6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.
3 changes: 1 addition & 2 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1880,8 +1880,7 @@ impl Step for RemoteCopyLibs {
builder.info(&format!("REMOTE copy libs to emulator ({})", target));
t!(fs::create_dir_all(builder.out.join("tmp")));

let server =
builder.ensure(tool::RemoteTestServer { compiler: compiler.with_stage(0), target });
let server = builder.ensure(tool::RemoteTestServer { compiler, target });

// Spawn the emulator and wait for it to come online
let tool = builder.tool_exe(Tool::RemoteTestClient);
Expand Down
24 changes: 9 additions & 15 deletions src/tools/remote-test-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,25 +218,19 @@ fn handle_run(socket: TcpStream, work: &Path, tmp: &Path, lock: &Mutex<()>, conf
cmd.args(args);
cmd.envs(env);

// On windows, libraries are just searched in the executable directory,
// system directories, PWD, and PATH, in that order. PATH is the only one
// we can change for this.
let library_path = if cfg!(windows) { "PATH" } else { "LD_LIBRARY_PATH" };

// Support libraries were uploaded to `work` earlier, so make sure that's
// in `LD_LIBRARY_PATH`. Also include our own current dir which may have
// had some libs uploaded.
if cfg!(windows) {
// On windows, libraries are just searched in the executable directory,
// system directories, PWD, and PATH, in that order. PATH is the only one
// we can change for this.
cmd.env(
"PATH",
env::join_paths(
std::iter::once(work.to_owned())
.chain(std::iter::once(path.clone()))
.chain(env::split_paths(&env::var_os("PATH").unwrap())),
)
.unwrap(),
);
} else {
cmd.env("LD_LIBRARY_PATH", format!("{}:{}", work.display(), path.display()));
let mut paths = vec![work.to_owned(), path.clone()];
if let Some(library_path) = env::var_os(library_path) {
paths.extend(env::split_paths(&library_path));
}
cmd.env(library_path, env::join_paths(paths).unwrap());

// Some tests assume RUST_TEST_TMPDIR exists
cmd.env("RUST_TEST_TMPDIR", tmp.to_owned());
Expand Down

0 comments on commit f0cd2e6

Please sign in to comment.