Skip to content

Commit e4475a4

Browse files
committed
---
yaml --- r: 182693 b: refs/heads/beta c: 7e83e46 h: refs/heads/master i: 182691: 214d8cd v: v3
1 parent d56fed6 commit e4475a4

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 577c4643dd3f098697c17606e64d92477247d4b5
34+
refs/heads/beta: 7e83e46556fea9f448e47f7879f5970c400fb24c
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/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)