about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-12-17 22:34:44 +0100
committerGitHub <noreply@github.com>2024-12-17 22:34:44 +0100
commit4b905c8a5df8bc5cecb0aab08fc31fb3e2b43db6 (patch)
tree319c3d6aa6191b166d5b4fc1e55647cac13677fc
parent53635e55476980a458e14d3fb3b101446d451d9c (diff)
parent13e8313f15cb334827003f1d21720ff91b286991 (diff)
downloadrust-4b905c8a5df8bc5cecb0aab08fc31fb3e2b43db6.tar.gz
rust-4b905c8a5df8bc5cecb0aab08fc31fb3e2b43db6.zip
Rollup merge of #134423 - jieyouxu:bootstrap-test-valid, r=onur-ozkan
bootstrap: use specific-purpose ui test path for `test_valid` self-test

I wanted to move some ui tests around in #134418, which broke `test_valid` since it was referencing two non-specific-purpose ui tests. This PR instead adds two dummy tests under `tests/ui/bootstrap/self-test/`, for that purpose specifically.

r? bootstrap
-rw-r--r--src/bootstrap/src/core/builder/tests.rs2
-rw-r--r--tests/ui/bootstrap/self-test/a.rs2
-rw-r--r--tests/ui/bootstrap/self-test/b.rs2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index b2ffbd9c70f..819a552093b 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -91,7 +91,7 @@ macro_rules! rustc {
 #[test]
 fn test_valid() {
     // make sure multi suite paths are accepted
-    check_cli(["test", "tests/ui/attr-start.rs", "tests/ui/attr-shebang.rs"]);
+    check_cli(["test", "tests/ui/bootstrap/self-test/a.rs", "tests/ui/bootstrap/self-test/b.rs"]);
 }
 
 #[test]
diff --git a/tests/ui/bootstrap/self-test/a.rs b/tests/ui/bootstrap/self-test/a.rs
new file mode 100644
index 00000000000..64d2d6f11bb
--- /dev/null
+++ b/tests/ui/bootstrap/self-test/a.rs
@@ -0,0 +1,2 @@
+//! Not used by compiler, this is used by bootstrap cli self-test.
+//@ ignore-test
diff --git a/tests/ui/bootstrap/self-test/b.rs b/tests/ui/bootstrap/self-test/b.rs
new file mode 100644
index 00000000000..91f92f67910
--- /dev/null
+++ b/tests/ui/bootstrap/self-test/b.rs
@@ -0,0 +1,2 @@
+//! Not used by compiler, used by bootstrap cli self-test.
+//@ ignore-test