Skip to content

Fix tests that fail when run concurrently. #3467

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.

Sign up for GitHub

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

Merged
emilio merged 1 commit into from
Sep 10, 2026
+10 −5
Merged

Fix tests that fail when run concurrently. #3467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions bindgen-tests/tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,12 +356,17 @@ macro_rules! test_header {
($function:ident, $header:expr) => {
#[test]
fn $function() {
let tmpdir = tempfile::tempdir().unwrap();
let header = PathBuf::from($header);
let result = create_bindgen_builder(&header).and_then(|builder| {
let check_roundtrip =
env::var_os("BINDGEN_DISABLE_ROUNDTRIP_TEST").is_none();
compare_generated_header(&header, builder, check_roundtrip)
});
let result =
create_bindgen_builder(&header).and_then(|mut builder| {

@emilio emilio Sep 10, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're panicking anyway below, maybe worth simplifying this to:

let builder = create_bindgen_builder(&header).unwrap();
builder.builder.clang_macro_fallback_build_dir(tmpdir.path());
let check_roundtrip = ...;
compare_generated_header(...).unwrap();

Or so?

But I guess looks good either way.

View changes since the review

builder.builder = builder
.builder
.clang_macro_fallback_build_dir(tmpdir.path());
let check_roundtrip =
env::var_os("BINDGEN_DISABLE_ROUNDTRIP_TEST").is_none();
compare_generated_header(&header, builder, check_roundtrip)
});

if let Err(err) = result {
panic!("{err}");
Expand Down
Loading