From 38a2711720e6bdd8c765d05fbcef4383bb680b4b Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 13 Jul 2023 19:01:42 -0400 Subject: [PATCH 1/2] integration-test: properly rebuild bpf on change --- test/integration-test/build.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration-test/build.rs b/test/integration-test/build.rs index c36d20a4..1a0859a0 100644 --- a/test/integration-test/build.rs +++ b/test/integration-test/build.rs @@ -96,6 +96,7 @@ fn main() { for (src, dst) in c_bpf_probes { let src = bpf_dir.join(src); + println!("cargo:rerun-if-changed={}", src.to_str().unwrap()); let mut cmd = Command::new("clang"); cmd.arg("-I") .arg(&libbpf_headers_dir) @@ -117,6 +118,7 @@ fn main() { } let ebpf_dir = manifest_dir.parent().unwrap().join("integration-ebpf"); + println!("cargo:rerun-if-changed={}", ebpf_dir.to_str().unwrap()); let target = format!("{target}-unknown-none"); let mut cmd = Command::new("cargo"); From c250c6c9db0996a2e8d22c306f89c182092269ba Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 13 Jul 2023 19:22:08 -0400 Subject: [PATCH 2/2] integration-test: avoid cargo deadflock --- test/integration-test/build.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration-test/build.rs b/test/integration-test/build.rs index 1a0859a0..3d9fa08e 100644 --- a/test/integration-test/build.rs +++ b/test/integration-test/build.rs @@ -119,6 +119,7 @@ fn main() { let ebpf_dir = manifest_dir.parent().unwrap().join("integration-ebpf"); println!("cargo:rerun-if-changed={}", ebpf_dir.to_str().unwrap()); + let target = format!("{target}-unknown-none"); let mut cmd = Command::new("cargo"); @@ -131,6 +132,9 @@ fn main() { "--target", &target, ]); + // Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself. + let ebpf_target_dir = out_dir.join("integration-ebpf"); + cmd.arg("--target-dir").arg(&ebpf_target_dir); let mut child = cmd .stdout(Stdio::piped()) .spawn()