From 7ee4eb452714ae38633ff33e3a8493a5923b5fa4 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Fri, 19 Apr 2024 08:20:02 -0700 Subject: [PATCH] tests(backtraces) update backtrace formats for latest Rust toolchain --- .../directives/006-backtraces_directive.t | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/t/01-wasm/directives/006-backtraces_directive.t b/t/01-wasm/directives/006-backtraces_directive.t index 5798fca44..1d8bfa977 100644 --- a/t/01-wasm/directives/006-backtraces_directive.t +++ b/t/01-wasm/directives/006-backtraces_directive.t @@ -63,7 +63,7 @@ qq{ qr# 7: 0x[0-9a-f]+ - (|hostcalls\.wasm)!hostcalls::filter::::on_http_request_headers::h[0-9a-f]+#, qr# 8: 0x[0-9a-f]+ - (|hostcalls\.wasm)!proxy_wasm::dispatcher::Dispatcher::on_http_request_headers::h[0-9a-f]+#, qr# 9: 0x[0-9a-f]+ - (|hostcalls\.wasm)!proxy_on_request_headers#, - qr#note: using the `WASMTIME_BACKTRACE_DETAILS=1` environment variable may show more debugging informatio#, + qr#(note: using the `WASMTIME_BACKTRACE_DETAILS=1` environment variable may show more debugging information)?#, qr#^$#, qr#Caused by:#, qr# wasm trap: wasm `unreachable` instruction executed#, @@ -104,13 +104,13 @@ qq{ qr/\[crit\] .*? panicked at/, qr/custom trap/, qr/\[error\] .*? \[wasm\] error while executing at wasm backtrace:/, - qr# 0: 0x[0-9a-f]+ - .*?abort#, - qr# at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+ *- __rust_start_panic#, - qr# at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+#, + qr# 0: 0x[0-9a-f]+ - .*?(abort|__rust_start_panic)#, + qr#( at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+ *- __rust_start_panic)?#, + qr#( at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+)?#, qr# 1: 0x[0-9a-f]+ - .*?rust_panic#, - qr# at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+#, + qr#( at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+)?#, qr# 2: 0x[0-9a-f]+ - .*?rust_panic_with_hook#, - qr# at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+#, + qr#( at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+)?#, qr# 3: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::panicking::begin_panic::\{\{closure\}\}::h[0-9a-f]+#, qr# 4: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::sys_common::backtrace::__rust_end_short_backtrace::h[0-9a-f]+#, qr# 5: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::panicking::begin_panic::h[0-9a-f]+#, @@ -158,13 +158,13 @@ qq{ qr/\[crit\] .*? panicked at/, qr/custom trap/, qr/\[error\] .*? \[wasm\] error while executing at wasm backtrace:/, - qr# 0: 0x[0-9a-f]+ - .*?abort#, - qr# at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+ *- __rust_start_panic#, - qr# at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+#, + qr# 0: 0x[0-9a-f]+ - .*?(abort|__rust_start_panic)#, + qr#( at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+ *- __rust_start_panic)?#, + qr#( at /rustc/[0-9a-f]+/library/panic_abort/src/lib.rs:[0-9]+:[0-9]+)?#, qr# 1: 0x[0-9a-f]+ - .*?rust_panic#, - qr# at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+#, + qr#( at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+)?#, qr# 2: 0x[0-9a-f]+ - .*?rust_panic_with_hook#, - qr# at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+#, + qr#( at /rustc/[0-9a-f]+/library/std/src/panicking.rs:[0-9]+:[0-9]+)?#, qr# 3: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::panicking::begin_panic::\{\{closure\}\}::h[0-9a-f]+#, qr# 4: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::sys_common::backtrace::__rust_end_short_backtrace::h[0-9a-f]+#, qr# 5: 0x[0-9a-f]+ - (|hostcalls\.wasm)!std::panicking::begin_panic::h[0-9a-f]+#,