about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-08-10 12:17:46 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-08-11 15:08:48 +0000
commit665a61938dea5735a0ec2ce5fbc76fbba0fae679 (patch)
tree116ff6a991e4820e2fb3c785b2096573159515e6
parent43f04e12add4dc15bbbb215467781ee3b2b228b8 (diff)
downloadrust-665a61938dea5735a0ec2ce5fbc76fbba0fae679.tar.gz
rust-665a61938dea5735a0ec2ce5fbc76fbba0fae679.zip
Bump ui_test
-rw-r--r--Cargo.toml2
-rw-r--r--tests/compile-test.rs6
2 files changed, 2 insertions, 6 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 6730888f58a..1ab6d7e118f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index fd7839ba7f9..cb1c0941a30 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -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| {