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

refactor: cfg for test/* #2230

Merged
merged 3 commits into from
Dec 9, 2023
Merged

refactor: cfg for test/* #2230

merged 3 commits into from
Dec 9, 2023

Conversation

SteveLauC
Copy link
Member

What does this PR do

cfg for test/*.rs

This PR also applies the netbsdlike alias added in #2226

Checklist:

  • I have read CONTRIBUTING.md
  • I have written necessary tests and rustdoc comments
  • A change log has been added if this PR modifies nix's API

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

LGTM, but needs a rebase

test/sys/mod.rs Outdated
target_os = "netbsd",
target_os = "openbsd"
))]
#[cfg(any(linux_android, freebsdlike, netbsdlike, target_os = "macos"))]
Copy link
Member

Choose a reason for hiding this comment

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

This is a candidate for apple_targets. I think ptrace defines all the same symbols for ios etc as for macos.

@SteveLauC
Copy link
Member Author

but needs a rebase

done

@asomers
Copy link
Member

asomers commented Dec 8, 2023

but needs a rebase

done

Needs another.

apple_targets,
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris"))] {
Copy link
Member Author

@SteveLauC SteveLauC Dec 9, 2023

Choose a reason for hiding this comment

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

Here we have both solarish and target_os = "solarish", this was accidentially introduced in #2248, in case you are curious about the reason

@SteveLauC
Copy link
Member Author

Needs another.

done

@asomers asomers added this pull request to the merge queue Dec 9, 2023
Merged via the queue into nix-rust:master with commit 6961f0f Dec 9, 2023
35 checks passed
@SteveLauC SteveLauC deleted the cfg_for_test branch December 10, 2023 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants