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

auto merge of #5174 : ehegnes/servo/issue-5159, r=Manishearth

Browse source 
Fix warnings and introduce usage of `std::env` over deprecated `std::os`
functions.
This commit is contained in:
bors-servo 2015-03-08 00:51:44 -07:00
commit e404cf3763
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/contenttest.rs
View file

@ -7,13 +7,15 @@
// 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)]
extern crate getopts; extern crate getopts;
extern crate test; 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}; use std::{os, 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};
@ -27,13 +29,13 @@ struct Config {
} }
fn main() { fn main() {
let args = os::args(); let args = env::args();
let config = parse_config(args.into_iter().collect()); let config = parse_config(args.map(|x| x.into_string().unwrap()).collect());
let opts = test_options(config.clone()); let opts = test_options(config.clone());
let tests = find_tests(config); let tests = find_tests(config);
match run_tests_console(&opts, tests) { match run_tests_console(&opts, tests) {
Ok(false) => os::set_exit_status(1), // tests failed Ok(false) => env::set_exit_status(1), // tests failed
Err(_) => os::set_exit_status(2), // I/O-related failure Err(_) => env::set_exit_status(2), // I/O-related failure
_ => (), _ => (),
} }
} }