Change explicit_counter_loop's message to add parentheses if necessary

[rust.git] / tests / compile-test.rs

diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index 62fa17d388a5dbcadc25454fe545e41b162c7a38..b6a4beff0469864781aeadb9bf019fe9f13c6eb9 100644 (file)
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -1,15 +1,6 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #![feature(test)]
 
-extern crate compiletest_rs as compiletest;
+use compiletest_rs as compiletest;
 extern crate test;
 
 use std::env::{set_var, var};
@@ -17,7 +8,6 @@
 use std::fs;
 use std::io;
 use std::path::{Path, PathBuf};
-use std::process::Command;
 
 fn clippy_driver_path() -> PathBuf {
     if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
@@ -43,28 +33,6 @@ fn rustc_lib_path() -> PathBuf {
     option_env!("RUSTC_LIB_PATH").unwrap().into()
 }
 
-fn rustc_sysroot_path() -> PathBuf {
-    option_env!("SYSROOT")
-        .map(String::from)
-        .or_else(|| std::env::var("SYSROOT").ok())
-        .or_else(|| {
-            let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
-            let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
-            home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain)))
-        })
-        .or_else(|| {
-            Command::new("rustc")
-                .arg("--print")
-                .arg("sysroot")
-                .output()
-                .ok()
-                .and_then(|out| String::from_utf8(out.stdout).ok())
-                .map(|s| s.trim().to_owned())
-        })
-        .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust")
-        .into()
-}
-
 fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
     let mut config = compiletest::Config::default();
 
@@ -79,9 +47,8 @@ fn config(mode: &str, dir: PathBuf) -> compiletest::Config {
         config.compile_lib_path = rustc_lib_path();
     }
     config.target_rustcflags = Some(format!(
-        "-L {0} -L {0}/deps -Dwarnings --sysroot {1}",
-        host_libs().display(),
-        rustc_sysroot_path().display()
+        "-L {0} -L {0}/deps -Dwarnings -Zui-testing",
+        host_libs().display()
     ));
 
     config.mode = cfg_mode;
@@ -166,7 +133,6 @@ fn prepare_env() {
 #[test]
 fn compile_test() {
     prepare_env();
-    run_mode("run-pass", "tests/run-pass".into());
     run_mode("ui", "tests/ui".into());
     run_ui_toml();
 }