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

Rollup of 7 pull requests #63228

Merged
merged 24 commits into from
Aug 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
159dcb2
On `format!()` arg count mismatch provide extra info
estebank Jul 30, 2019
86f4f68
Improve handling of invalid references in `format!()`
estebank Jul 30, 2019
762f645
review comments
estebank Jul 30, 2019
9e59d74
fix tests
estebank Jul 30, 2019
22ea38d
fix dedup
estebank Jul 31, 2019
79a1e7a
build_helper: rename run -> run_verbose (seems unused)
RalfJung Aug 1, 2019
0d8c97b
build_helper: rename (try_)run_silent -> (try_)run
RalfJung Aug 1, 2019
30f61de
replace what I think is an erroneous try_run_quiet by try_run
RalfJung Aug 1, 2019
14be088
Round generator sizes to multiple of their alignment
tmandry Aug 2, 2019
875cef0
Cleanup 'print_generic_params'.
Centril Aug 2, 2019
dd98727
Print outer attributes on formal params.
Centril Aug 2, 2019
d1c89d6
Test for printing attrs on formal params.
Centril Aug 2, 2019
57f9423
Clarify semantics of mem::zeroed
gnzlbg Aug 2, 2019
13b4afe
Remove trailing whitespace
gnzlbg Aug 2, 2019
3725e35
Consistency.
gnzlbg Aug 2, 2019
208672f
remove unsupported test case
bpangWR Aug 1, 2019
2b0f448
Added support for armv7-unknown-linux-gnueabi and armv7-unknown-linux…
adrian-budau Jul 29, 2019
a2735a3
Rollup merge of #63107 - adrian-budau:master, r=alexcrichton
Centril Aug 2, 2019
edc846f
Rollup merge of #63121 - estebank:formatting-pos, r=alexcrichton
Centril Aug 2, 2019
726f39a
Rollup merge of #63196 - RalfJung:build_helper, r=alexcrichton
Centril Aug 2, 2019
ed7b044
Rollup merge of #63206 - BaoshanPang:master, r=alexcrichton
Centril Aug 2, 2019
109b21f
Rollup merge of #63208 - tmandry:issue-62658, r=cramertj
Centril Aug 2, 2019
f6d8977
Rollup merge of #63212 - Centril:param-attrs-pretty, r=davidtwco
Centril Aug 2, 2019
4520a39
Rollup merge of #63215 - gnzlbg:patch-6, r=Centril
Centril Aug 2, 2019
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
Prev Previous commit
Next Next commit
remove unsupported test case
  • Loading branch information
bpangWR committed Aug 2, 2019
commit 208672f0d5da53b3553ac40d40c2a033ed883850
64 changes: 0 additions & 64 deletions src/libstd/sys/vxworks/process/process_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,67 +403,3 @@ impl ExitCode {
self.0 as i32
}
}

#[cfg(all(test, not(target_os = "emscripten")))]
mod tests {
use super::*;

use crate::ffi::OsStr;
use crate::mem;
use crate::ptr;
use crate::sys::cvt;

macro_rules! t {
($e:expr) => {
match $e {
Ok(t) => t,
Err(e) => panic!("received error for `{}`: {}", stringify!($e), e),
}
}
}

extern {
fn sigemptyset(set: *mut libc::sigset_t) -> libc::c_int;
fn sigaddset(set: *mut libc::sigset_t, signum: libc::c_int) -> libc::c_int;
}

#[test]
fn test_process_mask() {
unsafe {
// Test to make sure that a signal mask does not get inherited.
let mut cmd = Command::new(OsStr::new("cat"));

let mut set: libc::sigset_t = mem::uninitialized();
let mut old_set: libc::sigset_t = mem::uninitialized();
t!(cvt(sigemptyset(&mut set)));
t!(cvt(sigaddset(&mut set, libc::SIGINT)));
t!(cvt(libc::pthread_sigmask(libc::SIG_SETMASK, &set, &mut old_set)));

cmd.stdin(Stdio::MakePipe);
cmd.stdout(Stdio::MakePipe);

let (mut cat, mut pipes) = t!(cmd.spawn(Stdio::Null, true));
let stdin_write = pipes.stdin.take().unwrap();
let stdout_read = pipes.stdout.take().unwrap();

t!(cvt(libc::pthread_sigmask(libc::SIG_SETMASK, &old_set,
ptr::null_mut())));

t!(cvt(libc::kill(cat.id() as libc::pid_t, libc::SIGINT)));
// We need to wait until SIGINT is definitely delivered. The
// easiest way is to write something to cat, and try to read it
// back: if SIGINT is unmasked, it'll get delivered when cat is
// next scheduled.
let _ = stdin_write.write(b"Hello");
drop(stdin_write);

// Either EOF or failure (EPIPE) is okay.
let mut buf = [0; 5];
if let Ok(ret) = stdout_read.read(&mut buf) {
assert_eq!(ret, 0);
}

t!(cat.wait());
}
}
}