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

auto merge of #5204 : ehegnes/servo/squelch_contenttest, r=jdm

Browse source 
This actually fixes 5159.
This commit is contained in:
bors-servo 2015-03-12 20:48:47 -06:00
commit 5f439e7eaa
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/contenttest.rs
View file

@ -7,7 +7,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![feature(collections, core, io, os, path, rustc_private, std_misc, test)] #![feature(collections, core, env, io, os, path, rustc_private, std_misc, test)]
extern crate getopts; extern crate getopts;
extern crate test; extern crate test;
@ -15,7 +15,7 @@ extern crate test;
use test::{AutoColor, TestOpts, run_tests_console, TestDesc, TestDescAndFn, DynTestFn, DynTestName}; use test::{AutoColor, TestOpts, run_tests_console, TestDesc, TestDescAndFn, DynTestFn, DynTestName};
use test::ShouldFail; use test::ShouldFail;
use getopts::{getopts, reqopt}; use getopts::{getopts, reqopt};
use std::{os, str, env}; use std::{str, env};
use std::old_io::fs; use std::old_io::fs;
use std::old_io::Reader; use std::old_io::Reader;
use std::old_io::process::{Command, Ignored, CreatePipe, InheritFd, ExitStatus}; use std::old_io::process::{Command, Ignored, CreatePipe, InheritFd, ExitStatus};
@ -88,14 +88,19 @@ fn make_test(file: String) -> TestDescAndFn {
} }
fn run_test(file: String) { fn run_test(file: String) {
let path = os::make_absolute(&Path::new(file)).unwrap(); 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 stdout = CreatePipe(false, true);
let stderr = InheritFd(2); let stderr = InheritFd(2);
let args = ["-z", "-f", infile.as_slice()]; let args = ["-z", "-f", infile.as_slice()];
let mut prc = match Command::new(os::self_exe_path().unwrap().join("servo")) let mut prc_arg = env::current_exe().unwrap();
let prc_arg = match prc_arg.pop() {
true => prc_arg.join("servo"),
_ => panic!("could not pop directory"),
};
let mut prc = match Command::new(prc_arg)
.args(args.as_slice()) .args(args.as_slice())
.stdin(Ignored) .stdin(Ignored)
.stdout(stdout) .stdout(stdout)