Skip to content

Commit

Permalink
Resolves servo#7031 - Fix warnings in ./mach test-ref
Browse files Browse the repository at this point in the history
  • Loading branch information
Yoric committed Aug 7, 2015
1 parent b9dcd49 commit 200acce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions tests/reftest.rs
Expand Up @@ -8,10 +8,8 @@
// except according to those terms.

#![feature(append)]
#![feature(exit_status)]
#![feature(fs_walk)]
#![feature(path_ext)]
#![feature(slice_extras)]
#![feature(slice_patterns)]
#![feature(test)]

Expand All @@ -25,6 +23,7 @@ use std::ffi::OsStr;
use std::fs::{PathExt, File, walk_dir};
use std::io::{self, Read, Result};
use std::path::{Path, PathBuf};
use std::process;
use std::process::{Command, Stdio};
use test::{AutoColor, DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn, ShouldPanic};
use test::run_tests_console;
Expand All @@ -43,7 +42,8 @@ bitflags!(

fn main() {
let args: Vec<String> = env::args().collect();
let mut parts = args.tail().split(|e| &**e == "--");

let mut parts = args[1..].split(|e| &**e == "--");

let harness_args = parts.next().unwrap(); // .split() is never empty
let servo_args = parts.next().unwrap_or(&[]);
Expand Down Expand Up @@ -101,8 +101,8 @@ fn main() {
match run(test_opts,
all_tests,
servo_args.iter().map(|x| x.clone()).collect()) {
Ok(false) => env::set_exit_status(1), // tests failed
Err(_) => env::set_exit_status(2), // I/O-related failure
Ok(false) => process::exit(1), // tests failed
Err(_) => process::exit(2), // I/O-related failure
_ => (),
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/util/lib.rs
Expand Up @@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#![feature(plugin, custom_derive, heap_api)]
#![feature(plugin, custom_derive)]
#![plugin(plugins)]
extern crate util;
extern crate libc;
Expand Down

0 comments on commit 200acce

Please sign in to comment.