From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 0F7E5387090F for ; Sun, 10 May 2020 15:59:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0F7E5387090F X-ASG-Debug-ID: 1589126381-0c856e18f313a24f0001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id i2kUr1ummIxCzMY8 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 10 May 2020 11:59:41 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@efficios.com X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from smarchi-efficios.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id 1F8FF441B21; Sun, 10 May 2020 11:59:41 -0400 (EDT) From: Simon Marchi X-Barracuda-Effective-Source-IP: 192-222-164-54.qc.cable.ebox.net[192.222.164.54] X-Barracuda-Apparent-Source-IP: 192.222.164.54 X-Barracuda-RBL-IP: 192.222.164.54 To: gdb-patches@sourceware.org Cc: Michael Weghorn , Simon Marchi Subject: [PATCH 2/2] gdb/testsuite: add inferior arguments test Date: Sun, 10 May 2020 11:59:37 -0400 X-ASG-Orig-Subj: [PATCH 2/2] gdb/testsuite: add inferior arguments test Message-Id: <20200510155937.1064329-2-simon.marchi@efficios.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200510155937.1064329-1-simon.marchi@efficios.com> References: <1190e73a-8f10-dc6d-4d59-b9a2929530ad@simark.ca> <20200510155937.1064329-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1589126381 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 8294 X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.81756 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M X-Spam-Status: No, score=-31.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, 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: Sun, 10 May 2020 15:59:43 -0000 Add a test for verifying different methods of passing arguments to the inferior: the start, starti and run commands, as well as `set args`. All these methods work naturally when using the unix or native-extended-gdbserver target boards. Since those are non-stub boards, GDB runs new inferiors and therefore pass arguments to them. With target boards where GDB connects to a stub, for example with native-gdbserver, they don't really make sense. The inferior process is already started when GDB connects. However, the "run" method is still tested with stub targets, because the gdb_run_cmd procedure is adapted for stub targets. Instead of issuing the `run` command, it spawns whatever program is supposed to bring up the stub (gdbserver, for example) using gdb_reload and makes GDB connect to it. So this allows us to exercise argument passing through the gdbserver command line, when testing with the native-gdbserver board. Note that there is already a gdb.base/args.exp, but this tests specifically the --args switch of GDB. Perhaps it could be integrated in this new test, as a new "method". gdb/testsuite/ChangeLog: * lib/gdb.exp (gdb_run_cmd): Return success or failure. * gdb.base/inferior-args.exp: New file. * gdb.base/inferior-args.c: New file. --- gdb/testsuite/gdb.base/inferior-args.c | 8 ++ gdb/testsuite/gdb.base/inferior-args.exp | 126 +++++++++++++++++++++++ gdb/testsuite/lib/gdb.exp | 21 ++-- 3 files changed, 147 insertions(+), 8 deletions(-) create mode 100644 gdb/testsuite/gdb.base/inferior-args.c create mode 100644 gdb/testsuite/gdb.base/inferior-args.exp diff --git a/gdb/testsuite/gdb.base/inferior-args.c b/gdb/testsuite/gdb.base/inferior-args.c new file mode 100644 index 000000000000..74ca58b50852 --- /dev/null +++ b/gdb/testsuite/gdb.base/inferior-args.c @@ -0,0 +1,8 @@ +#include + +int main(int argc, char **argv) { + for (int i = 0; i < argc; i++) + printf("[%d] %s\n", i, argv[i]); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/inferior-args.exp b/gdb/testsuite/gdb.base/inferior-args.exp new file mode 100644 index 000000000000..dcda102fe52b --- /dev/null +++ b/gdb/testsuite/gdb.base/inferior-args.exp @@ -0,0 +1,126 @@ +# Copyright 2020 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 . + +# Test running an inferior with arguments. + +# This does not work on boards that don't support inferior arguments. +if [target_info exists noargs] then { + verbose "skipping gdb.base/inferior-args.exp because of noargs" + return +} + +standard_testfile .c + +if {[build_executable "failed to prepare" $testfile $srcfile debug] == -1} { + return +} + +clean_restart $binfile + +proc do_test { method } { + global binfile hex + + # The second arg is an empty string on purpose. + set inferior_args { "first arg" "" "third-arg" } + + clean_restart $binfile + + if { $method == "start" } { + # The start command does not make sense for a stub. + if { [use_gdb_stub] } { + return; + } + + if { [gdb_start_cmd $inferior_args] < 0 } { + fail "could not issue start command" + return -1 + } + + # Consume up to the GDB prompt after the stop. + gdb_test "" ".*main.*" "stop at main" + + } elseif { $method == "starti" } { + # The starti command does not make sense for a stub. + if { [use_gdb_stub] } { + return; + } + + if { [gdb_starti_cmd $inferior_args] < 0 } { + fail "could not issue start command" + return -1 + } + + # Consume up to the GDB prompt after the stop. + gdb_test "" "" "stop at first instruction" + + # Put a breakpoint and continue until main. + if { ![gdb_breakpoint "main" message] } { + fail "could not set breakpoint on main" + return -1 + } + + if { [gdb_continue "main"] != 0 } { + fail "could not continue to main" + return -1 + } + + } elseif { $method == "run" } { + if { ![gdb_breakpoint "main" message] } { + fail "could not set breakpoint on main" + return -1 + } + + # The run command does not make sense for a stub, but GDB_RUN_CMD + # does the right thing when the target is a stub (start the stub, + # connect to it, and "continue"). + # + # This allows us to test arguments passed on the gdbserver command + # line. + if { [gdb_run_cmd $inferior_args] < 0 } { + fail "could not run" + return -1 + } + + # Consume up to the GDB prompt after the stop. + gdb_test "" ".*main.*" "stop at main" + + } elseif { $method == "set args" } { + # Using "set args" does not make sense with a stub. + if { [use_gdb_stub] } { + return; + } + + gdb_test_no_output "set args $inferior_args" + + if { ![runto_main] } { + fail "could not run to main" + return -1 + } + + } else { + error "invalid method $method" + } + + # Now that we are stopped at main, inspect argc/argv. + gdb_test "print argc" " = 4" + gdb_test "print argv\[0\]" " = $hex \".*\"" + gdb_test "print argv\[1\]" " = $hex \"first arg\"" + gdb_test "print argv\[2\]" " = $hex \"\"" + gdb_test "print argv\[3\]" " = $hex \"third-arg\"" +} + +foreach_with_prefix method { "start" "starti" "run" "set args" } { + do_test $method +} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index ec77cfb0d318..a5eeba6b3cd6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -241,6 +241,8 @@ proc target_can_use_run_cmd {} { # Generic run command. # +# Return 0 if we could start the program, -1 if we could not. +# # The second pattern below matches up to the first newline *only*. # Using ``.*$'' could swallow up output that we attempt to match # elsewhere. @@ -268,14 +270,14 @@ proc gdb_run_cmd { {inferior_args {}} } { if $use_gdb_stub { if [target_info exists gdb,do_reload_on_run] { if { [gdb_reload $inferior_args] != 0 } { - return + return -1 } send_gdb "continue\n" gdb_expect 60 { -re "Continu\[^\r\n\]*\[\r\n\]" {} default {} } - return + return 0 } if [target_info exists gdb,start_symbol] { @@ -291,7 +293,7 @@ proc gdb_run_cmd { {inferior_args {}} } { # clever and not send a command when it has failed. if [expr $start_attempt > 3] { perror "Jump to start() failed (retry count exceeded)" - return + return -1 } set start_attempt [expr $start_attempt + 1] gdb_expect 30 { @@ -300,7 +302,7 @@ proc gdb_run_cmd { {inferior_args {}} } { } -re "No symbol \"_start\" in current.*$gdb_prompt $" { perror "Can't find start symbol to run in gdb_run" - return + return -1 } -re "No symbol \"start\" in current.*$gdb_prompt $" { send_gdb "jump *_start\n" @@ -313,22 +315,23 @@ proc gdb_run_cmd { {inferior_args {}} } { } -re "The program is not being run.*$gdb_prompt $" { if { [gdb_reload $inferior_args] != 0 } { - return + return -1 } send_gdb "jump *$start\n" } timeout { perror "Jump to start() failed (timeout)" - return + return -1 } } } - return + + return 0 } if [target_info exists gdb,do_reload_on_run] { if { [gdb_reload $inferior_args] != 0 } { - return + return -1 } } send_gdb "run $inferior_args\n" @@ -345,6 +348,8 @@ proc gdb_run_cmd { {inferior_args {}} } { # There is no more input expected. } } + + return 0 } # Generic start command. Return 0 if we could start the program, -1 -- 2.26.2