Skip to content
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.

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

Fix: Ignore CARGO_BUILD_TARGET in tests #1010

Merged
merged 3 commits into from
Oct 28, 2024
Merged
Changes from all commits
Commits
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
21 changes: 20 additions & 1 deletion tests/profile.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use cbindgen::*;

use serial_test::serial;
use std::env;
use std::path::{Path, PathBuf};
use std::process::Command;

Expand All @@ -17,7 +18,12 @@ fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir {
.tempdir()
.expect("Creating tmp dir failed");

std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path());
unsafe {
env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path());
env::remove_var("CARGO_BUILD_TARGET");
// ^ avoid unexpected change of layout of the target directory;
// ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html
}
let builder = Builder::new()
.with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap())
.with_crate(expand_dep_test_dir);
Expand Down Expand Up @@ -45,6 +51,9 @@ fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir {
Command::new(cbindgen_path)
.current_dir(expand_dep_test_dir)
.env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path())
.env_remove("CARGO_BUILD_TARGET")
// ^ avoid unexpected change of layout of the target directory;
// ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html
.args(extra_args)
.output()
.expect("build should succeed");
Expand Down Expand Up @@ -87,6 +96,16 @@ fn bin_default_uses_debug_build() {
assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
}

#[test]
bryango marked this conversation as resolved.
Show resolved Hide resolved
#[serial]
fn bin_ignore_cargo_build_target_in_tests() {
unsafe {
env::set_var("CARGO_BUILD_TARGET", "x86_64-unknown-linux-gnu");
}
// ^ this env var should be ignored:
bin_default_uses_debug_build();
}

#[test]
fn bin_explicit_debug_build() {
let target_dir = build_using_bin(&["--profile", "debug"]);
Expand Down
Loading