Skip to content

Commit

Permalink
Attempt fix for assertion on Windows, and add extra output for debugg…
Browse files Browse the repository at this point in the history
…ing.
  • Loading branch information
quantheory committed Jan 22, 2015
1 parent 06d4019 commit 918dd34
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions src/test/run-pass/issue-15149.rs
Expand Up @@ -8,14 +8,16 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use std::path::BytesContainer;
use std::io::{Command, fs, USER_RWX};
use std::os;

fn main() {
// If we're the child, make sure we were invoked correctly
let args = os::args();
if args.len() > 1 && args[1].as_slice() == "child" {
return assert_eq!(args[0].as_slice(), "mytest");
return assert_eq!(args[0],
format!("mytest{}", os::consts::EXE_SUFFIX));
}

test();
Expand All @@ -38,7 +40,12 @@ fn test() {
path.push(child_dir.clone());
let path = os::join_paths(path.as_slice()).unwrap();

assert!(Command::new("mytest").env("PATH", path.as_slice())
.arg("child")
.status().unwrap().success());
let child_output = Command::new("mytest").env("PATH", path.as_slice())
.arg("child")
.output().unwrap();

assert!(child_output.status.success(),
format!("child assertion failed\n child stdout:\n {}\n child stderr:\n {}",
child_output.output.container_as_str().unwrap(),
child_output.error.container_as_str().unwrap()));
}

0 comments on commit 918dd34

Please sign in to comment.