From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 9BB683858CDA; Fri, 14 Oct 2022 17:59:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9BB683858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665770375; bh=RH1DB1ah4iyGmeMlO1N+CT1MSKb3owaEZQFxfRSQHFE=; h=From:To:Subject:Date:From; b=Rfj6E60pBldy+0pdwE37J+QAuknkdiulBCYADubHKJPFeL3NLBrbAxnwe91NAkIfS TPGLezMSbkimf/qCfnnNKio493y8dqFLrhJWKhvC3Flpxtg+u1Ug8lSwg73t8cZHyV c3zE+mxNpXYDQv4zbd/41FYT9vySd/cVXXSYVlzw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix host board local-remote-host-notty.exp timeouts X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 17c68d98f74b98704bf5a934dd6a0356a1e08802 X-Git-Newrev: c4c8c27263d2dd25647314f4897bd01ad1a78847 Message-Id: <20221014175935.9BB683858CDA@sourceware.org> Date: Fri, 14 Oct 2022 17:59:35 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc4c8c27263d2= dd25647314f4897bd01ad1a78847 commit c4c8c27263d2dd25647314f4897bd01ad1a78847 Author: Tom de Vries Date: Fri Oct 14 19:59:26 2022 +0200 [gdb/testsuite] Fix host board local-remote-host-notty.exp timeouts =20 With test-case gdb.server/stop-reply-no-thread-multi.exp and host board local-remote-host-notty.exp we occasionally run into a silent out, due = to getting: ... (gdb) kill^M (gdb) The program is not being run.^M ... instead of the expected: ... (gdb) kill^M The program is not being run.^M (gdb) ... =20 Likewise, we occasionally run into a nonsilent timeout: ... (gdb) disconnect^M (gdb) You can't do that when your target is `exec'^M FAIL: gdb.server/stop-reply-no-thread.exp: to_disable=3DTthread: t_nons= top=3Don: \ disconnect (timeout) ... =20 Typically, this results in the test-case taking more than two minutes t= o run. =20 The problem can be reproduced using just: ... $ ssh -l $USER 127.0.0.1 gdb -q -ex kill ... =20 Note that ssh by default uses -T which disables pseudo-tty allocation (= as opposed to -t which forces pseudo-tty allocation): ... $ ssh -l $USER 127.0.0.1 -T tty not a tty $ ssh -l $USER 127.0.0.1 -t tty /dev/pts/5 Connection to 127.0.0.1 closed. ... and according to https://stackoverflow.com/a/63241102 the behaviour we'= re seeing is specific to using '-T'. =20 The related host board local-remote-host.exp does use '-t', and the only difference between the two boards mentioned is whether editing is on or= off. =20 Fix this by: - moving the content of local-remote-host-notty.exp into local-remote-host.exp - consequently, extending the copyright years in local-remote-host.exp - including local-remote-host.exp in local-remote-host-notty.exp (making local-remote-host-notty.exp use '-t') - adding -iex "set editing off" to GDBFLAGS in local-remote-host-notty.= exp =20 This results in the test-case taking just 6 seconds to run. =20 Tested on x86_64-linux. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D29669 Diff: --- gdb/testsuite/boards/local-remote-host-notty.exp | 34 +++----------------- gdb/testsuite/boards/local-remote-host.exp | 41 ++++++++++++++++++++= ++-- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/gdb/testsuite/boards/local-remote-host-notty.exp b/gdb/testsui= te/boards/local-remote-host-notty.exp index b858122afe0..88a431ca775 100644 --- a/gdb/testsuite/boards/local-remote-host-notty.exp +++ b/gdb/testsuite/boards/local-remote-host-notty.exp @@ -18,36 +18,10 @@ # # To use this file: # bash$ cd ${build_dir}/gdb -# bash$ make check RUNTESTFLAGS=3D"--host_board=3Dlocal-remote-host" +# bash$ make check RUNTESTFLAGS=3D"--host_board=3Dlocal-remote-host-notty" =20 -global GDB -set GDB [file join [pwd] "../gdb"] +# Like local-remote-host, but with readline/editing disabled. =20 -set_board_info hostname 127.0.0.1 +load_board_description "local-remote-host" =20 -set_board_info username $env(USER) - -# The ssh key should be correctly set up that you ssh to 127.0.0.1 -# without having to type password. -set_board_info rsh_prog /usr/bin/ssh -set_board_info rcp_prog /usr/bin/scp -set_board_info file_transfer "rsh" - -proc ${board}_file { dest op args } { - if { $op =3D=3D "delete" } { - return 0 - } - return [eval [list standard_file $dest $op] $args] -} - -proc ${board}_download { board src dest } { - - # If file name is a relative, convert it to absolute, otherwise file c= an't - # be found on host, because the current directory usually is /home/$US= ER. - # This also bypasses the real download to the host. - if { [file pathtype $src] =3D=3D "relative" } { - return [file join [pwd] $src] - } else { - return $src - } -} +set GDBFLAGS "${GDBFLAGS} -iex \"set editing off\"" diff --git a/gdb/testsuite/boards/local-remote-host.exp b/gdb/testsuite/boa= rds/local-remote-host.exp index 8d69a568f23..fc87dd48014 100644 --- a/gdb/testsuite/boards/local-remote-host.exp +++ b/gdb/testsuite/boards/local-remote-host.exp @@ -1,4 +1,4 @@ -# Copyright 2014-2022 Free Software Foundation, Inc. +# Copyright 2012-2022 Free Software Foundation, Inc. =20 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,9 +13,46 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 +# This file is a dejagnu "board file" and is used to run the testsuite +# against local host, in remote host mode. +# +# To use this file: +# bash$ cd ${build_dir}/gdb +# bash$ make check RUNTESTFLAGS=3D"--host_board=3Dlocal-remote-host" + # Like local-remote-host-notty, but with readline/editing enabled. =20 -load_board_description "local-remote-host-notty" +global GDB +set GDB [file join [pwd] "../gdb"] + +set_board_info hostname 127.0.0.1 + +set_board_info username $env(USER) + +# The ssh key should be correctly set up that you ssh to 127.0.0.1 +# without having to type password. +set_board_info rsh_prog /usr/bin/ssh +set_board_info rcp_prog /usr/bin/scp +set_board_info file_transfer "rsh" + +proc ${board}_file { dest op args } { + if { $op =3D=3D "delete" } { + return 0 + } + return [eval [list standard_file $dest $op] $args] +} + +proc ${board}_download { board src dest } { + + # If file name is a relative, convert it to absolute, otherwise file c= an't + # be found on host, because the current directory usually is /home/$US= ER. + # This also bypasses the real download to the host. + if { [file pathtype $src] =3D=3D "relative" } { + return [file join [pwd] $src] + } else { + return $src + } +} =20 # Like standard_spawn, but force pseudo-tty allocation, with 'ssh -t'.