-
Notifications
You must be signed in to change notification settings - Fork 665
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix test_ptymaster_drop after PR #1098
This test cannot be compiled under Redox. PR #1098 attempted to disable it for Redox, but actually disabled it everywhere. AFAICT, Cargo has no syntax to conditionally enable a target, except based on features. Instead, use conditional compilation within the test.
- Loading branch information
Showing
2 changed files
with
23 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,24 @@ | ||
use nix::fcntl::OFlag; | ||
use nix::pty::*; | ||
use nix::unistd::close; | ||
use std::os::unix::io::AsRawFd; | ||
#[cfg(not(target_os = "redox"))] | ||
mod t { | ||
use nix::fcntl::OFlag; | ||
use nix::pty::*; | ||
use nix::unistd::close; | ||
use std::os::unix::io::AsRawFd; | ||
|
||
/// Regression test for Issue #659 | ||
/// `PtyMaster` should panic rather than double close the file descriptor | ||
/// This must run in its own test process because it deliberately creates a race | ||
/// condition. | ||
#[test] | ||
#[should_panic(expected = "Closing an invalid file descriptor!")] | ||
// In Travis on i686-unknown-linux-musl, this test gets SIGABRT. I don't know | ||
// why. It doesn't happen on any other target, and it doesn't happen on my PC. | ||
#[cfg_attr(all(target_env = "musl", target_arch = "x86"), ignore)] | ||
fn test_double_close() { | ||
let m = posix_openpt(OFlag::O_RDWR).unwrap(); | ||
close(m.as_raw_fd()).unwrap(); | ||
drop(m); // should panic here | ||
/// Regression test for Issue #659 | ||
/// | ||
/// `PtyMaster` should panic rather than double close the file descriptor | ||
/// This must run in its own test process because it deliberately creates a | ||
/// race condition. | ||
#[test] | ||
#[should_panic(expected = "Closing an invalid file descriptor!")] | ||
// In Travis on i686-unknown-linux-musl, this test gets SIGABRT. I don't | ||
// know why. It doesn't happen on any other target, and it doesn't happen | ||
// on my PC. | ||
#[cfg_attr(all(target_env = "musl", target_arch = "x86"), ignore)] | ||
fn test_double_close() { | ||
let m = posix_openpt(OFlag::O_RDWR).unwrap(); | ||
close(m.as_raw_fd()).unwrap(); | ||
drop(m); // should panic here | ||
} | ||
} |