Skip to content

Commit 2468cbf

Browse files
committed
---
yaml --- r: 174960 b: refs/heads/snap-stage3 c: 7e83e46 h: refs/heads/master v: v3
1 parent 9155996 commit 2468cbf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 577c4643dd3f098697c17606e64d92477247d4b5
4+
refs/heads/snap-stage3: 7e83e46556fea9f448e47f7879f5970c400fb24c
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/test/run-pass/issue-15149.rs

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

11+
use std::slice::SliceExt;
1112
use std::io::{Command, fs, USER_RWX};
1213
use std::os;
1314
use std::path::BytesContainer;
@@ -17,8 +18,11 @@ fn main() {
1718
// If we're the child, make sure we were invoked correctly
1819
let args = os::args();
1920
if args.len() > 1 && args[1].as_slice() == "child" {
20-
return assert_eq!(args[0],
21-
format!("mytest{}", os::consts::EXE_SUFFIX));
21+
// FIXME: This should check the whole `args[0]` instead of just
22+
// checking that it ends_with the executable name. This
23+
// is needed because of Windows, which has a different behavior.
24+
// See #15149 for more info.
25+
return assert!(args[0].ends_with(&format!("mytest{}", os::consts::EXE_SUFFIX)[]));
2226
}
2327

2428
test();

0 commit comments

Comments
 (0)