Skip to content

Commit bba00b5

Browse files
authored
Rollup merge of #98660 - eddyb:invalid-punct-stage1, r=lqd
Unbreak stage1 tests via ignore-stage1 in `proc-macro/invalid-punct-ident-1.rs`. #98188 broke `./x.py test --stage 1` (which I thought we ran in PR CI, cc `@rust-lang/infra)` i.e. the default `./x.py test` in dev checkouts, as the panic in `src/test/ui/proc-macro/invalid-punct-ident-1.rs` moved from the server (`rustc`) to the client (proc macro), and that means it's now affected by #59998. I made the test look like `src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.rs` tho I'm a bit confused why that one is in `src/test/ui-fulldeps`, it should still work in `src/test/ui`, no? (cc `@Aaron1011)`
2 parents 7dedec7 + a84e19d commit bba00b5

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

src/test/ui/proc-macro/invalid-punct-ident-1.rs

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
// aux-build:invalid-punct-ident.rs
2-
// rustc-env:RUST_BACKTRACE=0
3-
4-
// FIXME https://github.com/rust-lang/rust/issues/59998
5-
// normalize-stderr-test "thread.*panicked.*proc_macro.*lib.rs.*\n" -> ""
6-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
7-
// normalize-stderr-test "\nerror: internal compiler error.*\n\n" -> ""
8-
// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> ""
9-
// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
10-
// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
11-
// normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
12-
// normalize-stderr-test "query stack during panic:\n" -> ""
13-
// normalize-stderr-test "we're just showing a limited slice of the query stack\n" -> ""
14-
// normalize-stderr-test "end of query stack\n" -> ""
2+
// ignore-stage1
3+
// only-linux
4+
//
5+
// FIXME: This should be a normal (stage1, all platforms) test in
6+
// src/test/ui/proc-macro once issue #59998 is fixed.
157

168
#[macro_use]
179
extern crate invalid_punct_ident;

src/test/ui/proc-macro/invalid-punct-ident-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: proc macro panicked
2-
--> $DIR/invalid-punct-ident-1.rs:19:1
2+
--> $DIR/invalid-punct-ident-1.rs:11:1
33
|
44
LL | invalid_punct!();
55
| ^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)