From: Mark Wielaard <mark@klomp.org>
Date: Mon, 30 Jan 2023 09:21:01 +0000 (+0100)
Subject: bug464969_d_demangle.cpp: Always print "Xa"
X-Git-Tag: VALGRIND_3_21_0~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42d35e6d2ad7e83414e82a691956777064106624;p=thirdparty%2Fvalgrind.git

bug464969_d_demangle.cpp: Always print "Xa"

bug464969_d_demangle depends on producing an error about an
uninitialized variable. But it prints something different
to stdout based on the value of that variable. Which can
produce failures. Make sure to always print the same thing
to stdout.
---

diff --git a/memcheck/tests/bug464969_d_demangle.cpp b/memcheck/tests/bug464969_d_demangle.cpp
index b66c79b387..00155ce048 100644
--- a/memcheck/tests/bug464969_d_demangle.cpp
+++ b/memcheck/tests/bug464969_d_demangle.cpp
@@ -4,9 +4,9 @@ extern "C" void _D4test4findFiPxaZPxa()
 {
    int a;
    if (a)
-      std::cout << "a\n";
+      std::cout << "Xa\n";
    else
-      std::cout << "!a\n";
+      std::cout << "X" << "a\n";
 }
 
 int main()
diff --git a/memcheck/tests/bug464969_d_demangle.stdout.exp b/memcheck/tests/bug464969_d_demangle.stdout.exp
index 60fc874768..987e3267a0 100644
--- a/memcheck/tests/bug464969_d_demangle.stdout.exp
+++ b/memcheck/tests/bug464969_d_demangle.stdout.exp
@@ -1 +1 @@
-!a
+Xa