From patchwork Fri Oct 5 10:11:24 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: 29655 Received: (qmail 113196 invoked by alias); 5 Oct 2018 10:11:27 -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 113171 invoked by uid 89); 5 Oct 2018 10:11:27 -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=til, sk:build_e, catchpoint, gdb_assert 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; Fri, 05 Oct 2018 10:11:24 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 7499CB0F7; Fri, 5 Oct 2018 10:11:22 +0000 (UTC) Date: Fri, 5 Oct 2018 12:11:24 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Pedro Alves Subject: [PATCH][gdb/testsuite] Rewrite catch-follow-exec.exp Message-ID: <20181005101122.GA23867@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, There are two problems with the current catch-follow-exec.exp: - the datadir indicated by INTERNAL_GDBFLAGS is not used - remote host testing doesn't work correctly Rewrite catch-follow-exec.c to use gdb_spawn_with_cmdline_opts, fixing both problems. Build on x86_64-linux with and without ubsan, tested with and without --target_board=native-gdbserver. OK for trunk? Thanks, - Tom [gdb/testsuite] Rewrite catch-follow-exec.exp 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. --- gdb/testsuite/gdb.base/catch-follow-exec.c | 17 +++++++++++ gdb/testsuite/gdb.base/catch-follow-exec.exp | 44 ++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 12 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..6f977fef93 100644 --- a/gdb/testsuite/gdb.base/catch-follow-exec.exp +++ b/gdb/testsuite/gdb.base/catch-follow-exec.exp @@ -22,11 +22,6 @@ if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} { return -1 } -if { ![remote_file target exists /bin/bash] } { - unsupported "no bash" - return -} - if { ![remote_file target exists /bin/ls] } { unsupported "no ls" return @@ -34,24 +29,49 @@ if { ![remote_file target exists /bin/ls] } { proc catch_follow_exec { } { global binfile - global GDB + global gdb_spawn_id set test "catch-follow-exec" append FLAGS " \"$binfile\"" append FLAGS " -batch" + append FLAGS " -ex \"target native\"" append FLAGS " -ex \"catch exec\"" append FLAGS " -ex \"set follow-exec-mode new\"" 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're not testing the "status returned by the spawned process", + # because it's currently one, and we suspect it will be zero after + # fixing PR23368 - "gdb goes to into background when hitting exec + # catchpoint with follow-exec-mode new" + #gdb_assert { [lindex $result 3] == 0 } + + # 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 } }