Simplify compiletest setup
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index a63d708..b85a2b6 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -8,22 +8,12 @@
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 tests/deps/target/debug/deps".to_owned());
- if let Ok(name) = env::var("TESTNAME") {
- config.filter = Some(name);
- }
- config.src_base = format!("tests/{}", mode).into();
-
- compiletest::run_tests(&config);
-}
-
#[test]
fn ui() {
- run_mode("ui");
+ compiletest::run_tests(&compiletest::Config {
+ mode: compiletest::common::Mode::Ui,
+ src_base: std::path::PathBuf::from("tests/ui"),
+ target_rustcflags: Some(String::from("-L tests/deps/target/debug/deps")),
+ ..Default::default()
+ });
}
