Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move contenttest to the new process APIs.

Browse source
This commit is contained in:
Ms2ger 2015-03-27 21:09:28 +01:00
parent 5dd43bf84c
commit 6b0bf4cf0a
1 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tests/contenttest.rs
View file

@ -10,7 +10,6 @@
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![feature(exit_status)] #![feature(exit_status)]
#![feature(old_io)]
#![feature(path)] #![feature(path)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
@ -25,8 +24,7 @@ use getopts::{getopts, reqopt};
use std::{str, env}; use std::{str, env};
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fs::read_dir; use std::fs::read_dir;
use std::old_io::Reader; use std::process::{Command, Stdio};
use std::old_io::process::{Command, Ignored, CreatePipe, InheritFd, ExitStatus};
use std::thunk::Thunk; use std::thunk::Thunk;
#[derive(Clone)] #[derive(Clone)]
@ -99,8 +97,6 @@ fn run_test(file: String) {
let path = env::current_dir().unwrap().join(&file); let path = env::current_dir().unwrap().join(&file);
// FIXME (#1094): not the right way to transform a path // FIXME (#1094): not the right way to transform a path
let infile = format!("file://{}", path.display()); let infile = format!("file://{}", path.display());
let stdout = CreatePipe(false, true);
let stderr = InheritFd(2);
let args = ["-z", "-f", infile.as_slice()]; let args = ["-z", "-f", infile.as_slice()];
let mut prc_arg = env::current_exe().unwrap(); let mut prc_arg = env::current_exe().unwrap();
@ -108,29 +104,19 @@ fn run_test(file: String) {
true => prc_arg.join("servo"), true => prc_arg.join("servo"),
_ => panic!("could not pop directory"), _ => panic!("could not pop directory"),
}; };
let mut prc = match Command::new(prc_arg.to_str().unwrap()) let output = match Command::new(prc_arg.to_str().unwrap())
.args(args.as_slice()) .args(args.as_slice())
.stdin(Ignored) .stdin(Stdio::null())
.stdout(stdout) .stderr(Stdio::inherit())
.stderr(stderr) .output()
.spawn()
{ {
Ok(p) => p, Ok(p) => p,
_ => panic!("Unable to spawn process."), _ => panic!("Unable to spawn process."),
}; };
let mut output = Vec::new();
loop {
let byte = prc.stdout.as_mut().unwrap().read_byte();
match byte {
Ok(byte) => {
print!("{}", byte as char);
output.push(byte);
}
_ => break
}
}
let out = str::from_utf8(output.as_slice()); print!("{}", str::from_utf8(&output.stdout).unwrap());
let out = str::from_utf8(&output.stderr);
let lines: Vec<&str> = out.unwrap().split('\n').collect(); let lines: Vec<&str> = out.unwrap().split('\n').collect();
for &line in lines.iter() { for &line in lines.iter() {
if line.contains("TEST-UNEXPECTED-FAIL") { if line.contains("TEST-UNEXPECTED-FAIL") {
@ -138,8 +124,7 @@ fn run_test(file: String) {
} }
} }
let retval = prc.wait(); if !output.status.success() {
if retval != Ok(ExitStatus(0)) { panic!("Servo exited with non-zero status {:?}", output.status);
panic!("Servo exited with non-zero status {:?}", retval);
} }
} }