Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ui test crate #11239

Merged
merged 7 commits into from
Aug 11, 2023
+7,082 −6,140
Merged

Update ui test crate #11239

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c779da
Remove some leftover cruft from compiletest-rs
oli-obk Aug 3, 2023
0afd38b
Make a panic message more informative if binary files are accidentall…
oli-obk Aug 7, 2023
3d88fae
Update ui test crate
oli-obk Jul 27, 2023
00919a4
Update ui test crate to auto-detect aux build crate kind
oli-obk Jul 27, 2023
1088507
Canonicalize paths in a single location
oli-obk Aug 7, 2023
43f04e1
Bump ui_test crate
oli-obk Aug 8, 2023
665a619
Bump ui_test
oli-obk Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Bump ui_test
@oli-obk
oli-obk committed Aug 11, 2023
commit 665a61938dea5735a0ec2ce5fbc76fbba0fae679
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
termize = "0.1"

[dev-dependencies]
ui_test = "0.15"
ui_test = "0.17.0"
tester = "0.9"
regex = "1.5"
toml = "0.7.3"
6 changes: 1 addition & 5 deletions tests/compile-test.rs
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ fn canonicalize(path: impl AsRef<Path>) -> PathBuf {
}

fn base_config(test_dir: &str) -> (compiletest::Config, Args) {
let args = Args::test();
let args = Args::test().unwrap();
let mut config = compiletest::Config {
mode: TestMode::Yolo { rustfix: true },
stderr_filters: vec![],
@@ -202,7 +202,6 @@ fn run_ui() {

compiletest::run_tests_generic(
vec![config],
std::thread::available_parallelism().unwrap(),
args,
move |path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
compiletest::default_per_file_config,
@@ -229,7 +228,6 @@ fn run_internal_tests() {

compiletest::run_tests_generic(
vec![config],
std::thread::available_parallelism().unwrap(),
args,
move |path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
compiletest::default_per_file_config,
@@ -262,7 +260,6 @@ fn run_ui_toml() {

ui_test::run_tests_generic(
vec![config],
std::thread::available_parallelism().unwrap(),
args,
|path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
|config, path, _file_contents| {
@@ -320,7 +317,6 @@ fn run_ui_cargo() {

ui_test::run_tests_generic(
vec![config],
std::thread::available_parallelism().unwrap(),
args,
|path, _args, _config| test_filter(path) && path.ends_with("Cargo.toml"),
|config, path, _file_contents| {