Skip to content

Commit

Permalink
Rollup merge of rust-lang#134423 - jieyouxu:bootstrap-test-valid, r=o…
Browse files Browse the repository at this point in the history
…nur-ozkan

bootstrap: use specific-purpose ui test path for `test_valid` self-test

I wanted to move some ui tests around in rust-lang#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
  • Loading branch information
jieyouxu authored Dec 17, 2024
2 parents a8139c7 + 13e8313 commit f99cfe0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/builder/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/bootstrap/self-test/a.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//! Not used by compiler, this is used by bootstrap cli self-test.
//@ ignore-test
2 changes: 2 additions & 0 deletions tests/ui/bootstrap/self-test/b.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//! Not used by compiler, used by bootstrap cli self-test.
//@ ignore-test

0 comments on commit f99cfe0

Please sign in to comment.