[binutils-gdb] [gdb/testsuite] Accept new complex print style in mixed-lang-stack.exp

[binutils-gdb] [gdb/testsuite] Accept new complex print style in mixed-lang-stack.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cc77ed241bab61c0e86f4620e68be4481063a450

commit cc77ed241bab61c0e86f4620e68be4481063a450
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Apr 2 08:38:47 2020 +0200

    [gdb/testsuite] Accept new complex print style in mixed-lang-stack.exp
    
    Since commit 981c08ce72 "Change how complex types are printed in C", we see
    these FAILs:
    ...
    FAIL: gdb.fortran/mixed-lang-stack.exp: lang=auto: info args in frame #6
    FAIL: gdb.fortran/mixed-lang-stack.exp: lang=c: info args in frame #6
    FAIL: gdb.fortran/mixed-lang-stack.exp: lang=c: info args in frame #7
    FAIL: gdb.fortran/mixed-lang-stack.exp: lang=c++: info args in frame #6
    FAIL: gdb.fortran/mixed-lang-stack.exp: lang=c++: info args in frame #7
    ...
    
    The problem is that printing of complex types has changed from:
    ...
    d = 4 + 5 * I
    ...
    to:
    ...
    d = 4 + 5i
    ...
    but the test-case still checks for the old printing style.
    
    Fix this by updating the test-case to check for the new style.
    
    gdb/testsuite/ChangeLog:
    
    2020-04-02  Tom de Vries  <tdevries@suse.de>
    
            * gdb.fortran/mixed-lang-stack.exp: Accept new complex printing style.

Diff:
---
 gdb/testsuite/ChangeLog                        | 4 ++++
 gdb/testsuite/gdb.fortran/mixed-lang-stack.exp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f885b93ecd9..a6af43437c1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-02  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.fortran/mixed-lang-stack.exp: Accept new complex printing style.
+
 2020-04-01  Tom Tromey  <tom@tromey.com>
 
 	* gdb.base/complex-parts.exp: Add type tests.
diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
index c0531c3fd9f..793318626d6 100644
--- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
+++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
@@ -106,7 +106,7 @@ proc run_tests { lang } {
 	    set d_pattern "\\(4,5\\)"
 	    set f_pattern "$hex 'abcdef\\\\000'"
 	} else {
-	    set d_pattern "4 \\+ 5 \\* I"
+	    set d_pattern "4 \\+ 5i"
 	    set f_pattern "$hex \"abcdef\""
 	}
 
@@ -134,7 +134,7 @@ proc run_tests { lang } {
 	    "info frame in frame #7"
 
 	if { $lang == "c" || $lang == "c++" } {
-	    set d_pattern "4 \\+ 5 \\* I"
+	    set d_pattern "4 \\+ 5i"
 	    set e_pattern "\"abcdef\""
 	    set g_pattern "\{a = 1.5, b = 2.5\}"
 	} else {