From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 93559385DC3E for ; Thu, 2 Apr 2020 06:42:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 93559385DC3E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 27CCAACC6; Thu, 2 Apr 2020 06:42:05 +0000 (UTC) Subject: [committed][gdb/testsuite] Accept new complex print style in mixed-lang-stack.exp To: Tom Tromey , gdb-patches@sourceware.org References: <20200320215340.16749-1-tom@tromey.com> <20200320215340.16749-4-tom@tromey.com> From: Tom de Vries Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <98be8190-d392-804f-863a-c24fd7193b85@suse.de> Date: Thu, 2 Apr 2020 08:42:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200320215340.16749-4-tom@tromey.com> Content-Type: multipart/mixed; boundary="------------64AE334E66BF218C4700B53A" Content-Language: en-US X-Spam-Status: No, score=-32.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 06:42:08 -0000 This is a multi-part message in MIME format. --------------64AE334E66BF218C4700B53A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit [ was: Re: [PATCH v2 3/7] Change how complex types are printed in C ] On 20-03-2020 22:53, Tom Tromey wrote: > GCC accepts the "i" suffix for complex numbers. I think this is nicer > to read than the current output, so this patch changes the C code to > print complex numbers this way. > > gdb/ChangeLog > 2020-03-20 Tom Tromey > > * c-valprint.c (c_decorations): Change complex suffix to "i". > > gdb/testsuite/ChangeLog > 2020-03-20 Tom Tromey > > * gdb.compile/compile.exp: Update. > * gdb.compile/compile-cplus.exp: Update. > * gdb.base/varargs.exp: Update. > * gdb.base/floatn.exp: Update. > * gdb.base/endianity.exp: Update. > * gdb.base/callfuncs.exp (do_function_calls): Update. > * gdb.base/funcargs.exp (complex_args, complex_integral_args) > (complex_float_integral_args): Update. > * gdb.base/complex.exp: Update. > * gdb.base/complex-parts.exp: Update. > --- > gdb/ChangeLog | 4 ++++ > gdb/c-valprint.c | 2 +- > gdb/testsuite/ChangeLog | 13 +++++++++++++ > gdb/testsuite/gdb.base/callfuncs.exp | 6 +++--- > gdb/testsuite/gdb.base/complex-parts.exp | 6 +++--- > gdb/testsuite/gdb.base/complex.exp | 4 ++-- > gdb/testsuite/gdb.base/endianity.exp | 4 ++-- > gdb/testsuite/gdb.base/floatn.exp | 13 +++++-------- > gdb/testsuite/gdb.base/funcargs.exp | 20 ++++++++++---------- > gdb/testsuite/gdb.base/varargs.exp | 6 +++--- > gdb/testsuite/gdb.compile/compile-cplus.exp | 2 +- > gdb/testsuite/gdb.compile/compile.exp | 2 +- > 12 files changed, 48 insertions(+), 34 deletions(-) > > diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c > index 76a86faea6a..bde9c6cc883 100644 > --- a/gdb/c-valprint.c > +++ b/gdb/c-valprint.c > @@ -121,7 +121,7 @@ static const struct generic_val_print_decorations c_decorations = > { > "", > " + ", > - " * I", > + "i", > "true", > "false", > "void", This broke gdb.fortran/mixed-lang-stack.exp, fixed in patch below. Committed as obvious. Thanks, - Tom --------------64AE334E66BF218C4700B53A Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Accept-new-complex-print-style-in-mixed-lang-stack.exp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Accept-new-complex-print-style-in-mixed-l"; filename*1="ang-stack.exp.patch" [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 * gdb.fortran/mixed-lang-stack.exp: Accept new complex printing style. --- gdb/testsuite/gdb.fortran/mixed-lang-stack.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp index c0531c3fd9..793318626d 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 { --------------64AE334E66BF218C4700B53A--