From b3d9d51b517cce50547edd7454709fb6f311fe25 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 24 Nov 2018 15:35:49 -0800 Subject: [PATCH] Simplify compiletest setup --- test_suite/tests/compiletest.rs | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs index 24e33f7d..f36a62aa 100644 --- a/test_suite/tests/compiletest.rs +++ b/test_suite/tests/compiletest.rs @@ -10,22 +10,14 @@ extern crate compiletest_rs as compiletest; -use std::env; - -fn run_mode(mode: &'static str) { - let mut config = compiletest::Config::default(); - - config.mode = mode.parse().expect("invalid mode"); - config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned()); - if let Ok(name) = env::var("TESTNAME") { - config.filter = Some(name); - } - config.src_base = format!("tests/{}", mode).into(); +#[test] +fn compile_fail() { + let config = compiletest::Config { + mode: compiletest::common::Mode::CompileFail, + src_base: std::path::PathBuf::from("tests/compile-fail"), + target_rustcflags: Some("-L deps/target/debug/deps".to_owned()), + ..Default::default() + }; compiletest::run_tests(&config); } - -#[test] -fn compile_fail() { - run_mode("compile-fail"); -}