From patchwork Thu Oct 11 07:47:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 29705 Received: (qmail 113551 invoked by alias); 11 Oct 2018 07:47:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 113540 invoked by uid 89); 11 Oct 2018 07:47:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS, UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy=tdevries@suse.de, U*tdevries, sk:tdevrie, tdevriessusede X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 11 Oct 2018 07:47:46 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CE823AC6C; Thu, 11 Oct 2018 07:47:43 +0000 (UTC) Date: Thu, 11 Oct 2018 09:47:45 +0200 From: Tom de Vries To: Gary Benson Cc: Simon Marchi , gdb-patches@sourceware.org, Pedro Alves Subject: Re: [PATCH][gdb/testsuite] Rewrite catch-follow-exec.exp Message-ID: <20181011074744.GA7677@delia> References: <20181005101122.GA23867@delia> <20181009135155.GB12668@blade.nx> <8f8ffb94-5a0c-8b2b-d541-eaacd7d1f42c@suse.de> <20181010092735.GA29557@blade.nx> <20181010134423.GA23926@blade.nx> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181010134423.GA23926@blade.nx> User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes On Wed, Oct 10, 2018 at 02:44:24PM +0100, Gary Benson wrote: > Simon Marchi wrote: > > On 2018-10-10 05:27, Gary Benson wrote: > > > Tom de Vries wrote: > > > > On 10/9/18 3:51 PM, Gary Benson wrote: > > > > > Tom de Vries wrote: > > > > > > append FLAGS " \"$binfile\"" > > > > > > append FLAGS " -batch" > > > > > > + append FLAGS " -ex \"target native\"" > > > > > > append FLAGS " -ex \"catch exec\"" > > > > > > append FLAGS " -ex \"set follow-exec-mode new\"" > > > > > > > > > > I'm a little confused with this part, doesn't this force the > > > > > test to run on the host? > > > > > > > > The "target native" was an attempt to fix problems when running > > > > with --target_board=native-gdbserver. Perhaps it's better to > > > > bail out in that case, but I haven't yet figured out how to. Any > > > > advice here? > > > > > > Tests that can't run remote usually bail with something like this > > > at the start: > > > > > > if ![isnative] then { > > > return > > > } > > > > I have not looked at the test (I can do it latter today if > > necessary), but this comment caught my attention. isnative is > > likely not what you want to use, make sure to read the "Local vs > > Remote vs Native" section of the gdb/testsuite/README file. > > Oh! Ok, so [target_info gdb_protocol] != ""] maybe? Attached patch uses this this. OK for trunk? Thanks, - Tom [gdb/testsuite] Rewrite catch-follow-exec.exp There are two problems with the current catch-follow-exec.exp: - INTERNAL_GDBFLAGS (containing the datadir setting) is not used - remote host testing doesn't work Fix the former by using gdb_spawn_with_cmdline_opts. Fix the latter by requiring gdb-native. Build on x86_64-linux with and without ubsan, tested with and without --target_board=native-gdbserver. 2018-10-05 Tom de Vries PR gdb/23730 * gdb.base/catch-follow-exec.c: Add copyright notice. * gdb.base/catch-follow-exec.exp: Rewrite to use gdb_spawn_with_cmdline_opts. Require gdb-native. --- gdb/testsuite/gdb.base/catch-follow-exec.c | 17 ++++++++++++ gdb/testsuite/gdb.base/catch-follow-exec.exp | 41 ++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.c b/gdb/testsuite/gdb.base/catch-follow-exec.c index fa68a2a34e..1a59f58aa5 100644 --- a/gdb/testsuite/gdb.base/catch-follow-exec.c +++ b/gdb/testsuite/gdb.base/catch-follow-exec.c @@ -1,3 +1,20 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2018 Free Software Foundation, Inc. + + 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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + #include #include #include diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.exp b/gdb/testsuite/gdb.base/catch-follow-exec.exp index 0e32ed4a6f..2ccd0115e7 100644 --- a/gdb/testsuite/gdb.base/catch-follow-exec.exp +++ b/gdb/testsuite/gdb.base/catch-follow-exec.exp @@ -22,8 +22,8 @@ if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} { return -1 } -if { ![remote_file target exists /bin/bash] } { - unsupported "no bash" +if { [target_info gdb_protocol] != "" } { + unsupported "not native" return } @@ -34,7 +34,7 @@ if { ![remote_file target exists /bin/ls] } { proc catch_follow_exec { } { global binfile - global GDB + global gdb_spawn_id set test "catch-follow-exec" @@ -45,13 +45,36 @@ proc catch_follow_exec { } { append FLAGS " -ex \"run\"" append FLAGS " -ex \"info prog\"" - catch {exec /bin/bash -c "$GDB $FLAGS"} catchlog - send_log "$catchlog\n" + gdb_exit + if {[gdb_spawn_with_cmdline_opts "$FLAGS"] != 0} { + fail "spawn" + return + } + + gdb_test_multiple "" "run til exit" { + "runtime error:" { + # Error in case of --enable-ubsan + fail "No runtime error" + } + eof { + set result [wait -i $gdb_spawn_id] + verbose $result + + gdb_assert { [lindex $result 2] == 0 } + + # We suspect this will be zero instead of one after fixing PR23368 + # - "gdb goes to into background when hitting exec catchpoint with + # follow-exec-mode new" + gdb_assert { [lindex $result 3] == 1 } + + # Error in case of --disable-ubsan, we get + # "CHILDKILLED SIGSEGV {segmentation violation}" as extra + # argument(s). + gdb_assert { [llength $result] == 4 } + } - if { [regexp {No selected thread} $catchlog] } { - pass $test - } else { - fail $test + remote_close host + clear_gdb_spawn_id } }