From f60d333affb62b5aaec52efddc54db46ead9cf5e Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <eddyb@lyken.rs>
Date: Fri, 16 Jul 2021 18:22:14 +0300
Subject: [PATCH] tests: support -Zsymbol-mangling-version=v0 being the
 default.

---
 src/test/debuginfo/function-call.rs                          | 2 +-
 src/test/debuginfo/function-names.rs                         | 2 +-
 ...stderr => issue-47429-short-backtraces.legacy.run.stderr} | 2 +-
 src/test/ui/panics/issue-47429-short-backtraces.rs           | 5 +++++
 .../ui/panics/issue-47429-short-backtraces.v0.run.stderr     | 5 +++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename src/test/ui/panics/{issue-47429-short-backtraces.run.stderr => issue-47429-short-backtraces.legacy.run.stderr} (91%)
 create mode 100644 src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr

diff --git a/src/test/debuginfo/function-call.rs b/src/test/debuginfo/function-call.rs
index a5d5942b5395..75334558b589 100644
--- a/src/test/debuginfo/function-call.rs
+++ b/src/test/debuginfo/function-call.rs
@@ -1,5 +1,5 @@
 // This test does not passed with gdb < 8.0. See #53497.
-// min-gdb-version: 8.0
+// min-gdb-version: 10.1
 
 // compile-flags:-g
 
diff --git a/src/test/debuginfo/function-names.rs b/src/test/debuginfo/function-names.rs
index 28ab176ba509..b9e59f8e8297 100644
--- a/src/test/debuginfo/function-names.rs
+++ b/src/test/debuginfo/function-names.rs
@@ -1,5 +1,5 @@
 // Function names are formatted differently in old versions of GDB
-// min-gdb-version: 9.2
+// min-gdb-version: 10.1
 
 // compile-flags:-g
 
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.run.stderr b/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
similarity index 91%
rename from src/test/ui/panics/issue-47429-short-backtraces.run.stderr
rename to src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
index 328796389070..fcdc070a4c39 100644
--- a/src/test/ui/panics/issue-47429-short-backtraces.run.stderr
+++ b/src/test/ui/panics/issue-47429-short-backtraces.legacy.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:16:5
+thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:21:5
 stack backtrace:
    0: std::panicking::begin_panic
    1: issue_47429_short_backtraces::main
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.rs b/src/test/ui/panics/issue-47429-short-backtraces.rs
index 015ab8fdd80d..35ecfc0b2715 100644
--- a/src/test/ui/panics/issue-47429-short-backtraces.rs
+++ b/src/test/ui/panics/issue-47429-short-backtraces.rs
@@ -12,6 +12,11 @@
 // ignore-emscripten no panic or subprocess support
 // ignore-sgx no subprocess support
 
+// NOTE(eddyb) output differs between symbol mangling schemes
+// revisions: legacy v0
+// [legacy] compile-flags: -Zsymbol-mangling-version=legacy
+//     [v0] compile-flags: -Zsymbol-mangling-version=v0
+
 fn main() {
     panic!()
 }
diff --git a/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr b/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
new file mode 100644
index 000000000000..1cbf11739bfc
--- /dev/null
+++ b/src/test/ui/panics/issue-47429-short-backtraces.v0.run.stderr
@@ -0,0 +1,5 @@
+thread 'main' panicked at 'explicit panic', $DIR/issue-47429-short-backtraces.rs:21:5
+stack backtrace:
+   0: std::panicking::begin_panic::<&str>
+   1: issue_47429_short_backtraces::main
+note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.