Skip to content

Commit 0abc945

Browse files
committed
---
yaml --- r: 96085 b: refs/heads/dist-snap c: 09cb7ec h: refs/heads/master i: 96083: 6efb0cb v: v3
1 parent dd51a58 commit 0abc945

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
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: fcf9844891db2603c215aa7205ac50b5d3ba47dc
9+
refs/heads/dist-snap: 09cb7ecc6729e12a6561d62744697e134d362238
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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)