mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile-test tests to work with the new ui_test crate

Browse Source
This commit is contained in:
Philipp Krones 2023-07-02 15:07:39 +02:00
parent ba1ffec5b5
commit 4aa4fecf89
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/compile-test.rs
View File

@ -31,7 +31,7 @@ fn base_config(test_dir: &str) -> compiletest::Config {
},
dependencies_crate_manifest_path: Some("clippy_test_deps/Cargo.toml".into()),
target: None,
out_dir: "target/ui_test".into(),
out_dir: PathBuf::from(std::env::var_os("CARGO_TARGET_DIR").unwrap_or("target".into())).join("ui_test"),
..compiletest::Config::rustc(Path::new("tests").join(test_dir))
};
@ -116,10 +116,7 @@ fn run_ui_toml() {
config.stderr_filter(
&regex::escape(
&std::path::Path::new(file!())
.parent()
.unwrap()
.canonicalize()
&fs::canonicalize("tests")
.unwrap()
.parent()
.unwrap()
@ -175,10 +172,7 @@ fn run_ui_cargo() {
config.stderr_filter(
&regex::escape(
&std::path::Path::new(file!())
.parent()
.unwrap()
.canonicalize()
&fs::canonicalize("tests")
.unwrap()
.parent()
.unwrap()