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 DB8293890427 for ; Thu, 4 Jun 2020 15:14:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DB8293890427 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 4B03EABE3; Thu, 4 Jun 2020 15:14:23 +0000 (UTC) Subject: [PATCH][gdb/testsuite] Remove path names from error messages in gdb_file_cmd From: Tom de Vries To: Pedro Alves , gdb-patches@sourceware.org References: <20200604102423.GA2054@delia> <6e23995a-349d-7c5e-970e-648c3fade47c@suse.de> <1fe127b1-7238-1348-138a-58d8c5fd477d@redhat.com> <7659b76b-1d9e-4bff-3bc5-018848568c53@redhat.com> <6bb39ac8-7e7b-a410-2350-40f5aa0cf617@suse.de> 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: <664564b0-52b6-d20f-c43e-7ba621b71975@suse.de> Date: Thu, 4 Jun 2020 17:14:13 +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: <6bb39ac8-7e7b-a410-2350-40f5aa0cf617@suse.de> Content-Type: multipart/mixed; boundary="------------562F09AD306F5A00442175DB" Content-Language: en-US X-Spam-Status: No, score=-16.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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, 04 Jun 2020 15:14:22 -0000 This is a multi-part message in MIME format. --------------562F09AD306F5A00442175DB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit [ was: Re: [committed][gdb/testsuite] Fix use of fail in gdb_cmd_file ] On 04-06-2020 16:18, Tom de Vries wrote: > [ was: Re: [PATCH][gdb/testsuite] Fix PATH error in gdb_file_cmd ] > > On 04-06-2020 15:22, Pedro Alves wrote: >> On 6/4/20 2:05 PM, Tom de Vries wrote: >> (That leaves the open question of whether we want to include the >> full paths in the ERROR, but that can be seen as an orthogonal issue >> if you'd like.) > > Yes, I'd prefer that. > How about this? Thanks, - Tom --------------562F09AD306F5A00442175DB Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Remove-path-names-from-error-messages-in-gdb_file_cmd.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Remove-path-names-from-error-messages-in-"; filename*1="gdb_file_cmd.patch" [gdb/testsuite] Remove path names from error messages in gdb_file_cmd In gdb_file_cmd, perror is called with error message strings using $arg and $GDB, both of which contain path names, which makes comparison of gdb.sum files more difficult. Fix this by using: - [file tail $arg] instead of $arg - GDB instead of $GDB. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-06-04 Tom de Vries * lib/gdb.exp (gdb_file_cmd): Avoid path names in error messages. --- gdb/testsuite/lib/gdb.exp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3cdaefaa9c..9a0620a2bf 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1762,6 +1762,7 @@ proc gdb_file_cmd { arg } { send_gdb "file $arg\n" set new_symbol_table 0 + set basename [file tail $arg] gdb_expect 120 { -re "Reading symbols from.*LZMA support was disabled.*$gdb_prompt $" { verbose "\t\tLoaded $arg into $GDB; .gnu_debugdata found but no LZMA available" @@ -1780,36 +1781,39 @@ proc gdb_file_cmd { arg } { } -re "Load new symbol table from \".*\".*y or n. $" { if { $new_symbol_table > 0 } { - perror "Couldn't load $arg, interactive prompt loop detected." + perror [join [list "Couldn't load $basename," + "interactive prompt loop detected."]] return -1 } send_gdb "y\n" answer incr new_symbol_table - set arg "$arg -- with new symbol table" + set suffix "-- with new symbol table" + set arg "$arg $suffix" + set basename "$basename $suffix" exp_continue } -re "No such file or directory.*$gdb_prompt $" { - perror "($arg) No such file or directory" + perror "($basename) No such file or directory" return -1 } -re "A problem internal to GDB has been detected" { - perror "Couldn't load $arg into $GDB (GDB internal error)." + perror "Couldn't load $basename into GDB (GDB internal error)." gdb_internal_error_resync return -1 } -re "$gdb_prompt $" { - perror "Couldn't load $arg into $GDB." + perror "Couldn't load $basename into GDB." return -1 } timeout { - perror "Couldn't load $arg into $GDB (timeout)." + perror "Couldn't load $basename into GDB (timeout)." return -1 } eof { # This is an attempt to detect a core dump, but seems not to # work. Perhaps we need to match .* followed by eof, in which # gdb_expect does not seem to have a way to do that. - perror "Couldn't load $arg into $GDB (eof)." + perror "Couldn't load $basename into GDB (eof)." return -1 } } --------------562F09AD306F5A00442175DB--