From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22122 invoked by alias); 23 Oct 2018 22:38:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 22110 invoked by uid 89); 23 Oct 2018 22:38:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.2 spammy=batch, life 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; Tue, 23 Oct 2018 22:38:51 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 3B983AE17; Tue, 23 Oct 2018 22:38:49 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Rewrite catch-follow-exec.exp From: Tom de Vries To: Simon Marchi , Gary Benson Cc: gdb-patches@sourceware.org, Pedro Alves References: <20181005101122.GA23867@delia> <20181009135155.GB12668@blade.nx> <8f8ffb94-5a0c-8b2b-d541-eaacd7d1f42c@suse.de> <20181010092735.GA29557@blade.nx> <20181010134423.GA23926@blade.nx> <20181011074744.GA7677@delia> <20181011083318.GA13751@blade.nx> <06b38d2e3f0a9394280553e70b9dfaf8@polymtl.ca> <480ea2be-eac0-8d19-cfe7-93c56b33a7ac@suse.de> <9d0dc535-b053-5063-eb0c-d7bf3e80fe49@suse.de> Message-ID: Date: Tue, 23 Oct 2018 22:38:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <9d0dc535-b053-5063-eb0c-d7bf3e80fe49@suse.de> Content-Type: multipart/mixed; boundary="------------78A6F4B6B8F282314A69C17F" X-IsSubscribed: yes X-SW-Source: 2018-10/txt/msg00530.txt.bz2 This is a multi-part message in MIME format. --------------78A6F4B6B8F282314A69C17F Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-length: 482 On 10/23/18 11:05 PM, Tom de Vries wrote: > On 10/23/18 11:04 PM, Simon Marchi wrote: >> On 2018-10-15 3:54 p.m., Tom de Vries wrote: >>>> Just wondering.  Would it make life easier if we fixed PR 23368, which >>>> is the reason we have to do the test in an unnatural way? >>> >>> Yes. >> >> Hi Tom, >> >> PR 23368 should be fixed now. Do you plan on updating catch-follow-exec.exp >> to be written in a more standard way? > > Sure, will do. How does this look? Thanks, - Tom --------------78A6F4B6B8F282314A69C17F Content-Type: text/x-patch; name="0001-gdb-testsuite-Rewrite-catch-follow-exec.exp-using-gdb_test.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Rewrite-catch-follow-exec.exp-using-gdb_t"; filename*1="est.patch" Content-length: 3071 [gdb/testsuite] Rewrite catch-follow-exec.exp using gdb_test The testcase catch-follow-exec.exp is written use gdb -batch in order to avoid a GDB SIGTTOU. After the commit of "Avoid GDB SIGTTOU on catch exec + set follow-exec-mode new (PR 23368)", that no longer is necessary. Rewrite the test using regular gdb_test commands. Tested with x86_64-linux. 2018-10-24 Tom de Vries * gdb.base/catch-follow-exec.exp: Rewrite using gdb_test. --- gdb/testsuite/gdb.base/catch-follow-exec.exp | 64 +++++++++------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/gdb/testsuite/gdb.base/catch-follow-exec.exp b/gdb/testsuite/gdb.base/catch-follow-exec.exp index c3c7c7ecdd..25d14b8465 100644 --- a/gdb/testsuite/gdb.base/catch-follow-exec.exp +++ b/gdb/testsuite/gdb.base/catch-follow-exec.exp @@ -18,66 +18,40 @@ standard_testfile -if { [target_info gdb_protocol] != "" } { - # Even though the feature under features being tested are supported by - # gdbserver, the way this test is written doesn't make it easy with a - # remote target. - unsupported "not native" - return -} - if { ![remote_file target exists /bin/ls] } { unsupported "no ls" return } -if { [build_executable "failed to prepare" $testfile $srcfile debug] == -1 } { - return -1 +if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { + return } proc catch_follow_exec { } { - global binfile - global gdb_spawn_id + global gdb_prompt gdb_spawn_id - set test "catch-follow-exec" + gdb_test "catch exec" \ + {Catchpoint [0-9][0-9]* \(exec\)} \ + "catch exec" - append FLAGS " \"$binfile\"" - append FLAGS " -batch" - append FLAGS " -ex \"catch exec\"" - append FLAGS " -ex \"set follow-exec-mode new\"" - append FLAGS " -ex \"run\"" - append FLAGS " -ex \"info prog\"" + gdb_test "set follow-exec-mode new" \ + "" \ + "set follow-exec-mode new" - gdb_exit - if {[gdb_spawn_with_cmdline_opts "$FLAGS"] != 0} { - fail "spawn" - return + gdb_run_cmd + gdb_expect { + -re ".*hit Catchpoint.*${gdb_prompt} $" { + pass "run" + } } - gdb_test_multiple "" "run til exit" { - "runtime error:" { - # Error in case of --enable-ubsan - fail "no runtime error" + gdb_test_multiple "info prog" "info prog" { + -i "$gdb_spawn_id" eof { + fail "info prog" } - 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] != 0 } - - # Error in case of --disable-ubsan, we get - # "CHILDKILLED SIGSEGV {segmentation violation}" as extra - # argument(s). - gdb_assert { [llength $result] == 4 } + -i "$gdb_spawn_id" "No selected thread\." { + pass "info prog" } - - remote_close host - clear_gdb_spawn_id } } --------------78A6F4B6B8F282314A69C17F--