Skip to content

Commit 0a2accb

Browse files
committed
---
yaml --- r: 93673 b: refs/heads/try c: 09cb7ec h: refs/heads/master i: 93671: 32050ba v: v3
1 parent 1e0f70b commit 0a2accb

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: fcf9844891db2603c215aa7205ac50b5d3ba47dc
5+
refs/heads/try: 09cb7ecc6729e12a6561d62744697e134d362238
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/io/process.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ pub enum StdioContainer {
8282
}
8383

8484
/// Describes the result of a process after it has terminated.
85+
/// Note that Windows have no signals, so the result is usually ExitStatus.
8586
#[deriving(Eq)]
8687
pub enum ProcessExit {
8788
/// Normal termination with an exit status.

branches/try/src/test/run-pass/signal-exit-status.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. this file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast
11+
// xfail-fast calling itself doesn't work on check-fast
1212

1313
use std::{os, run};
1414
use std::io::process;
@@ -20,8 +20,10 @@ fn main() {
2020
unsafe { *(0 as *mut int) = 0; }
2121
} else {
2222
let status = run::process_status(args[0], [~"signal"]);
23+
// Windows does not have signal, so we get exit status 0xC0000028 (STATUS_BAD_STACK).
2324
match status {
24-
process::ExitSignal(_) => {},
25+
process::ExitSignal(_) if cfg!(unix) => {},
26+
process::ExitStatus(0xC0000028) if cfg!(windows) => {},
2527
_ => fail!("invalid termination (was not signalled): {:?}", status)
2628
}
2729
}

0 commit comments

Comments
 (0)