From 34d93f1d9611ca110d71ebf7430df646247270dc Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 5 Jun 2024 18:56:58 +0300 Subject: fix(tvix): make rstest pick up new test case files Context: https://github.com/la10736/rstest/issues/256 Cargo will now cause a rebuild whenever a new test case file is added. Previsouly running `cargo test` after adding a new test case resulted in that case not being picked up and ignored. Change-Id: Ibfc420b5bfe3f3ee41d3ebd3fb9d248819fa6ed9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11751 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: Ilan Joselevich --- tvix/eval/build.rs | 7 ++++++- tvix/glue/build.rs | 6 ++++++ tvix/nix-compat/build.rs | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tvix/glue/build.rs create mode 100644 tvix/nix-compat/build.rs (limited to 'tvix') diff --git a/tvix/eval/build.rs b/tvix/eval/build.rs index a9c9a78b060d..b37a6e8a0c8d 100644 --- a/tvix/eval/build.rs +++ b/tvix/eval/build.rs @@ -5,5 +5,10 @@ fn main() { "cargo:rustc-env=TVIX_CURRENT_SYSTEM={}", &env::var("TARGET").unwrap() ); - println!("cargo:rerun-if-changed-env=TARGET") + println!("cargo:rerun-if-changed-env=TARGET"); + + // Pick up new test case files + // https://github.com/la10736/rstest/issues/256 + println!("cargo:rerun-if-changed=src/tests/nix_tests"); + println!("cargo:rerun-if-changed=src/tests/tvix_tests") } diff --git a/tvix/glue/build.rs b/tvix/glue/build.rs new file mode 100644 index 000000000000..544c34a6cbcb --- /dev/null +++ b/tvix/glue/build.rs @@ -0,0 +1,6 @@ +fn main() { + // Pick up new test case files + // https://github.com/la10736/rstest/issues/256 + println!("cargo:rerun-if-changed=src/tests/nix_tests"); + println!("cargo:rerun-if-changed=src/tests/tvix_tests") +} diff --git a/tvix/nix-compat/build.rs b/tvix/nix-compat/build.rs new file mode 100644 index 000000000000..c66b97016245 --- /dev/null +++ b/tvix/nix-compat/build.rs @@ -0,0 +1,5 @@ +fn main() { + // Pick up new test case files + // https://github.com/la10736/rstest/issues/256 + println!("cargo:rerun-if-changed=src/derivation/tests/derivation_tests") +} -- cgit 1.4.1