Auto merge of #7032 - Yoric:issue-7031, r=jdm

Issue 7031



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7032)
<!-- Reviewable:end -->

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/reftest.rs b/tests/reftest.rs
index 171749ffcd9..5104ed06128 100644
--- a/tests/reftest.rs
+++ b/tests/reftest.rs
@@ -8,7 +8,6 @@
 // except according to those terms.
 
 #![feature(append)]
-#![feature(exit_status)]
 #![feature(fs_walk)]
 #![feature(path_ext)]
 #![feature(slice_patterns)]
@@ -25,6 +24,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::run_tests_console;
 use test::{AutoColor, DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn, ShouldPanic};
@@ -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
         _ => (),
     }
 }
diff --git a/tests/unit/util/lib.rs b/tests/unit/util/lib.rs
index 1418618f0b4..a9d4cb7b482 100644
--- a/tests/unit/util/lib.rs
+++ b/tests/unit/util/lib.rs
@@ -2,8 +2,8 @@
  * 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)]
-#![plugin(plugins)]
+#![cfg_attr(test, feature(plugin, custom_derive, heap_api))]
+#![cfg_attr(test, plugin(plugins))]
 extern crate util;
 extern crate libc;
 extern crate euclid;