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 9D163384607B for ; Wed, 16 Sep 2020 12:55:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D163384607B 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.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0AB5CAC85; Wed, 16 Sep 2020 12:55:50 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Detect gdb prompt after monitor exit To: Pedro Alves , gdb-patches@sourceware.org References: <20200914192152.GA18245@delia> <4c088e4f-0c8d-62da-215e-b7062296cb33@palves.net> <2bdf800f-1f54-871c-0769-e833873cc099@suse.de> <98ef5ad6-3a12-7dc9-1561-b46758f39c8f@palves.net> 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: <69e90e69-6d42-b76d-ba56-9742731c4906@suse.de> Date: Wed, 16 Sep 2020 14:55:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <98ef5ad6-3a12-7dc9-1561-b46758f39c8f@palves.net> Content-Type: multipart/mixed; boundary="------------5C538D8E805538AB0F9AEAF6" Content-Language: en-US X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, NICE_REPLY_A, 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: Wed, 16 Sep 2020 12:55:37 -0000 This is a multi-part message in MIME format. --------------5C538D8E805538AB0F9AEAF6 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 9/16/20 12:59 PM, Pedro Alves wrote: > On 9/15/20 3:17 PM, Tom de Vries wrote: > >> Anyway, this seems to work: >> ... >> index a2cc80f28d..24733275ae 100644 >> --- a/gdb/testsuite/lib/gdbserver-support.exp >> +++ b/gdb/testsuite/lib/gdbserver-support.exp >> @@ -451,13 +451,20 @@ proc gdbserver_exit { is_mi } { >> # We use expect rather than gdb_expect because >> # we want to suppress printing exception messages, otherwise, >> # remote_expect, invoked by gdb_expect, prints the exceptions. >> + set have_prompt 0 >> expect { >> -i "$gdb_spawn_id" -re "$gdb_prompt $" { >> - exp_continue >> + if { [info exists server_spawn_id] } { >> + set have_prompt 1 > > I'd put this "set have_prompt 1" outside of the if, seems would read > clearer to me. > Done. > Otherwise LGTM. > >> + exp_continue >> + } >> } >> -i "$server_spawn_id" eof { >> wait -i $expect_out(spawn_id) >> unset server_spawn_id >> + if { ! $have_prompt } { >> + exp_continue >> + } >> } >> timeout { >> warning "Timed out waiting for EOF in server after >> $monitor_exit" >> ... >> >> I do wonder though about unsetting server_spawn_id and doing >> exp_continue while we still have the clause -i $server_spawn_id eof. I >> wonder this is supported behaviour. > > I'm not super sure, but I think it is, in that I don't think > the -i expression is reevaluated after exp_continue. > > For example, this works: > > $ cat exp.exp > set fake_spawn_id foo > > expect { > -re "foo" { > puts " got foo" > if [info exists fake_spawn_id] { > puts " unset" > unset fake_spawn_id > } > exp_continue > } > -i "$fake_spawn_id" -re "bar" { > puts " got bar?" > } > } > > $ expect exp.exp > foo > got foo > unset > foo > got foo > foo > got foo > bar > foo > got foo > > If it turns out to be an issue, we can always use an indirect > spawn id instead: > > "The -i flag may also name a global variable in which case the variable is read for a list of spawn ids. The variable is reread > whenever it changes. This provides a way of changing the I/O source while the command is in execution. Spawn ids provided this way > are called "indirect" spawn ids. " OK, then let's try it like this for now. Committed as attached. Thanks, - Tom --------------5C538D8E805538AB0F9AEAF6 Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Detect-gdb-prompt-after-monitor-exit.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Detect-gdb-prompt-after-monitor-exit.patc"; filename*1="h" [gdb/testsuite] Detect gdb prompt after monitor exit With this gdbserver-support.exp patch: ... @@ -451,8 +451,10 @@ proc gdbserver_exit { is_mi } { # We use expect rather than gdb_expect because # we want to suppress printing exception messages, otherwise, # remote_expect, invoked by gdb_expect, prints the exceptions. + set have_prompt 0 expect { -i "$gdb_spawn_id" -re "$gdb_prompt $" { + set have_prompt 1 exp_continue } -i "$server_spawn_id" eof { @@ -463,6 +465,7 @@ proc gdbserver_exit { is_mi } { warning "Timed out waiting for EOF in server after $monitor_exit" } } + gdb_assert {$have_prompt} } } close_gdbserver ... and with this in parallel: ... $ stress -c 5 ... we run into this and similar FAILs: ... FAIL: gdb.multi/multi-target.exp: continue: non-stop=on: $have_prompt ... In more detail: ... (gdb) PASS: gdb.multi/multi-target.exp: continue: non-stop=on: inferior 5 Remote debugging from host ::1, port 40712^M Process build/gdb/testsuite/outputs/gdb.multi/multi-target/multi-target \ created; pid = 11098^M monitor exit^M Killing process(es): 11098^M FAIL: gdb.multi/multi-target.exp: continue: non-stop=on: $have_prompt spawn build/gdb/testsuite/../../gdb/gdb -nw -nx -data-directory \ build/gdb/testsuite/../data-directory^M ... After issuing a "monitor exit" command, we should always get a prompt back, so check for that. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-09-16 Tom de Vries * lib/gdbserver-support.exp (gdbserver_exit): Make sure we get the gdb prompt after issuing "monitor exit". --- gdb/testsuite/lib/gdbserver-support.exp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index a2cc80f28d..2734ca6c87 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -451,13 +451,20 @@ proc gdbserver_exit { is_mi } { # We use expect rather than gdb_expect because # we want to suppress printing exception messages, otherwise, # remote_expect, invoked by gdb_expect, prints the exceptions. + set have_prompt 0 expect { -i "$gdb_spawn_id" -re "$gdb_prompt $" { - exp_continue + set have_prompt 1 + if { [info exists server_spawn_id] } { + exp_continue + } } -i "$server_spawn_id" eof { wait -i $expect_out(spawn_id) unset server_spawn_id + if { ! $have_prompt } { + exp_continue + } } timeout { warning "Timed out waiting for EOF in server after $monitor_exit" --------------5C538D8E805538AB0F9AEAF6--