Skip to content

Commit b5d6c1f

Browse files
felixcalexcrichton
authored andcommitted
---
yaml --- r: 149631 b: refs/heads/try2 c: e3a251a h: refs/heads/master i: 149629: 93e5108 149627: 3a598ee 149623: 54e7f4c 149615: 3c3326b 149599: 693f10e 149567: 248708f 149503: 6a254f5 v: v3
1 parent 235ed8d commit b5d6c1f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: cdc5729ea2dc98f83c9a88ce7aa0f52ba5a606e6
8+
refs/heads/try2: e3a251a41021ae0f8c0d97235d9da9d38e0d9f4a
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/test.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
use std::cell::RefCell;
12+
use std::io;
1213
use std::io::Process;
1314
use std::local_data;
1415
use std::os;
@@ -128,7 +129,10 @@ fn runtest(test: &str, cratename: &str, libs: HashSet<Path>, should_fail: bool)
128129
let exe = outdir.path().join("rust_out");
129130
let out = Process::output(exe.as_str().unwrap(), []);
130131
match out {
131-
Err(e) => fail!("couldn't run the test: {}", e),
132+
Err(e) => fail!("couldn't run the test: {}{}", e,
133+
if e.kind == io::PermissionDenied {
134+
" - maybe your tempdir is mounted with noexec?"
135+
} else { "" }),
132136
Ok(out) => {
133137
if should_fail && out.status.success() {
134138
fail!("test executable succeeded when it should have failed");

0 commit comments

Comments
 (0)