Auto merge of #12831 - fasterthanlime:proc-macro-test-in-tmp-dir, r=fasterthanlime

Build proc-macro-test-impl out-of-tree

Building it in-place fails in rust CI because the source directory is read-only. This changes `proc-macro-test`'s build script to first
copy `imp` under `OUT_DIR` (which is read-write).

It also prints stdout/stderr for the nested cargo invocation, should it fail. (I've seen failures in rust CI that I couldn't explain, and
when they take 25 minutes to reproduce, you want to have that info)

This change is tracked in:

  * https://github.com/rust-lang/rust-analyzer/issues/12818

Maintainer impact: none.
This commit is contained in:
bors 2022-07-20 15:21:03 +00:00
commit 7dc36eeb78

View File

@ -12,14 +12,43 @@ use std::{
use cargo_metadata::Message; use cargo_metadata::Message;
fn main() { fn main() {
println!("cargo:rerun-if-changed=imp");
let out_dir = env::var_os("OUT_DIR").unwrap(); let out_dir = env::var_os("OUT_DIR").unwrap();
let out_dir = Path::new(&out_dir); let out_dir = Path::new(&out_dir);
let name = "proc-macro-test-impl"; let name = "proc-macro-test-impl";
let version = "0.0.0"; let version = "0.0.0";
let imp_dir = std::env::current_dir().unwrap().join("imp");
let staging_dir = out_dir.join("proc-macro-test-imp-staging");
// this'll error out if the staging dir didn't previously exist. using
// `std::fs::exists` would suffer from TOCTOU so just do our best to
// wipe it and ignore errors.
let _ = std::fs::remove_dir_all(&staging_dir);
println!("Creating {}", staging_dir.display());
std::fs::create_dir_all(&staging_dir).unwrap();
let src_dir = staging_dir.join("src");
println!("Creating {}", src_dir.display());
std::fs::create_dir_all(src_dir).unwrap();
for item_els in [&["Cargo.toml"][..], &["src", "lib.rs"]] {
let mut src = imp_dir.clone();
let mut dst = staging_dir.clone();
for el in item_els {
src.push(el);
dst.push(el);
}
println!("Copying {} to {}", src.display(), dst.display());
std::fs::copy(src, dst).unwrap();
}
let target_dir = out_dir.join("target"); let target_dir = out_dir.join("target");
let output = Command::new(toolchain::cargo()) let output = Command::new(toolchain::cargo())
.current_dir("imp") .current_dir(&staging_dir)
.args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"]) .args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
// Explicit override the target directory to avoid using the same one which the parent // Explicit override the target directory to avoid using the same one which the parent
// cargo is using, or we'll deadlock. // cargo is using, or we'll deadlock.
@ -29,7 +58,14 @@ fn main() {
.arg(&target_dir) .arg(&target_dir)
.output() .output()
.unwrap(); .unwrap();
assert!(output.status.success()); if !output.status.success() {
println!("proc-macro-test-impl failed to build");
println!("============ stdout ============");
println!("{}", String::from_utf8_lossy(&output.stdout));
println!("============ stderr ============");
println!("{}", String::from_utf8_lossy(&output.stderr));
panic!("proc-macro-test-impl failed to build");
}
let mut artifact_path = None; let mut artifact_path = None;
for message in Message::parse_stream(output.stdout.as_slice()) { for message in Message::parse_stream(output.stdout.as_slice()) {