about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-07-23 22:30:02 +0000
committerbors <bors@rust-lang.org>2024-07-23 22:30:02 +0000
commit615284aa5ae46153d7796e882cf60d3c5727ce9e (patch)
tree657761002018e62dc0a7ae0a9293f9f13810edf5
parent760a278a1f2b4c04e3636e7f2ff2e3f7dfab4a4b (diff)
parentaf6d49d97c6d787f11563b6e3bf80ae5411eda6d (diff)
downloadrust-615284aa5ae46153d7796e882cf60d3c5727ce9e.tar.gz
rust-615284aa5ae46153d7796e882cf60d3c5727ce9e.zip
Auto merge of #13151 - Alexendoo:nextest, r=Jarcho
Fix running compile-test under cargo nextest

`ui_test` itself has `cargo nextest` support which we now use - https://github.com/oli-obk/ui_test/pull/161

It prints `ui_test` as its test name whereas we printed `compile_test`, this ended up being treated as a test name filter causing all the tests to be filtered out

changelog: none
-rw-r--r--tests/compile-test.rs9
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index e8c7cd1bc41..ea3a0a93ecc 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -268,15 +268,6 @@ fn run_ui_cargo() {
 }
 
 fn main() {
-    // Support being run by cargo nextest - https://nexte.st/book/custom-test-harnesses.html
-    if env::args().any(|arg| arg == "--list") {
-        if !env::args().any(|arg| arg == "--ignored") {
-            println!("compile_test: test");
-        }
-
-        return;
-    }
-
     set_var("CLIPPY_DISABLE_DOCS_LINKS", "true");
     // The SPEEDTEST_* env variables can be used to check Clippy's performance on your PR. It runs the
     // affected test 1000 times and gets the average.