Skip to content

Commit

Permalink
Support also normalizing column numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
est31 committed Nov 15, 2020
1 parent df41091 commit 763f52c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion tests/run-pass/backtrace-std.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/" -> "at RUSTLIB/"
// normalize-stderr-test "RUSTLIB/(.*):\d+"-> "RUSTLIB/$1:LL"
// normalize-stderr-test "RUSTLIB/([^:]*):(\d+)(:\d+)?"-> "RUSTLIB/$1:LL:?CC"
// normalize-stderr-test "/backtrace-std.rs:(\d+)(:\d+)?"-> "/backtrace-std.rs:$1:?CC"
// normalize-stderr-test "::<.*>" -> ""
// compile-flags: -Zmiri-disable-isolation

Expand Down
28 changes: 14 additions & 14 deletions tests/run-pass/backtrace-std.stderr
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
0: func_d
at $DIR/backtrace-std.rs:18
at $DIR/backtrace-std.rs:19:?CC
1: func_c
at $DIR/backtrace-std.rs:17
at $DIR/backtrace-std.rs:18:?CC
2: func_b
at $DIR/backtrace-std.rs:11
at $DIR/backtrace-std.rs:12:?CC
3: func_a
at $DIR/backtrace-std.rs:10
at $DIR/backtrace-std.rs:11:?CC
4: main
at $DIR/backtrace-std.rs:21
at $DIR/backtrace-std.rs:22:?CC
5: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn())
at RUSTLIB/core/src/ops/function.rs:LL
at RUSTLIB/core/src/ops/function.rs:LL:?CC
6: std::sys_common::backtrace::__rust_begin_short_backtrace
at RUSTLIB/std/src/sys_common/backtrace.rs:LL
at RUSTLIB/std/src/sys_common/backtrace.rs:LL:?CC
7: std::rt::lang_start::{closure#0}
at RUSTLIB/std/src/rt.rs:LL
at RUSTLIB/std/src/rt.rs:LL:?CC
8: std::ops::function::impls::call_once
at RUSTLIB/core/src/ops/function.rs:LL
at RUSTLIB/core/src/ops/function.rs:LL:?CC
9: std::panicking::r#try::do_call
at RUSTLIB/std/src/panicking.rs:LL
at RUSTLIB/std/src/panicking.rs:LL:?CC
10: std::panicking::r#try
at RUSTLIB/std/src/panicking.rs:LL
at RUSTLIB/std/src/panicking.rs:LL:?CC
11: std::panic::catch_unwind
at RUSTLIB/std/src/panic.rs:LL
at RUSTLIB/std/src/panic.rs:LL:?CC
12: std::rt::lang_start_internal
at RUSTLIB/std/src/rt.rs:LL
at RUSTLIB/std/src/rt.rs:LL:?CC
13: std::rt::lang_start
at RUSTLIB/std/src/rt.rs:LL
at RUSTLIB/std/src/rt.rs:LL:?CC

0 comments on commit 763f52c

Please sign in to comment.