public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.base/infcall-exec.exp for remote target Date: Tue, 15 Nov 2022 14:25:20 +0000 (GMT) [thread overview] Message-ID: <20221115142520.9BD563896C09@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3b35fb7cd0e2eeba611baf503d078fa395ebe1a8 commit 3b35fb7cd0e2eeba611baf503d078fa395ebe1a8 Author: Tom de Vries <tdevries@suse.de> Date: Tue Nov 15 15:24:54 2022 +0100 [gdb/testsuite] Fix gdb.base/infcall-exec.exp for remote target When running test-case gdb.base/infcall-exec.exp with target board remote-gdbserver-on-localhost (using REMOTE_TARGET_USERNAME) we run into: ... (gdb) call (int) execlp ("$outputs/gdb.base/infcall-exec/infcall-exec2", \ "$outputs/gdb.base/infcall-exec/infcall-exec2", (char *)0)^M $1 = -1^M (gdb) FAIL: gdb.base/infcall-exec.exp: call execlp ... Fix this by using just: ... (gdb) call (int) execlp ("infcall-exec2", "infcall-exec2", (char *)0)^M ... and using putenv ("PATH=...") to allow infcall-exec to exec infcall-exec2 if it's available alongside. Also fix the exec name in the test-case, such that we can successfully run the test-case: ... $ ./outputs/gdb.base/infcall-exec/infcall-exec PATH SETTING: 'PATH=./outputs/gdb.base/infcall-exec' $ ... Tested on x86_64-linux. Co-Authored-by: Ivan Tetyushkin <ivan.tetyushkin@syntacore.com> Diff: --- gdb/testsuite/gdb.base/infcall-exec.c | 48 +++++++++++++++++++++++++++++++-- gdb/testsuite/gdb.base/infcall-exec.exp | 10 ++++++- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.base/infcall-exec.c b/gdb/testsuite/gdb.base/infcall-exec.c index 75b629872d0..49c1f40a8d9 100644 --- a/gdb/testsuite/gdb.base/infcall-exec.c +++ b/gdb/testsuite/gdb.base/infcall-exec.c @@ -16,13 +16,57 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <unistd.h> +#include <stdlib.h> +#include <limits.h> +#include <string.h> +#include <stdio.h> +#include <assert.h> + +static void +set_path (int argc, char ** argv) +{ + if (argc < 1) + return; + + char path[PATH_MAX]; + strcpy (path, argv[0]); + int len = strlen (path); + + /* Make a path name out of an exec name. */ + int i; + for (i = len - 1; i >= 0; i--) + { + char c = path[i]; + if (c == '/' || c == '\\') + { + path[i] = '\0'; + break; + } + } + len = i; + + if (len == 0) + return; + + /* Prefix with "PATH=". */ + const char *prefix = "PATH="; + int prefix_len = strlen (prefix); + memmove (path + prefix_len, path, len); + path[prefix_len + len] = '\0'; + memcpy (path, prefix, prefix_len); + + printf ("PATH SETTING: '%s'\n", path); + putenv (path); +} int main (int argc, char ** argv) { - const char *prog = "inf-exec2"; + set_path (argc, argv); + const char *prog = "infcall-exec2"; - execlp (prog, prog, (char *) 0); + int res = execlp (prog, prog, (char *) 0); /* break here */ + assert (res != -1); return 0; } diff --git a/gdb/testsuite/gdb.base/infcall-exec.exp b/gdb/testsuite/gdb.base/infcall-exec.exp index e8f6a218c36..033dacb5e88 100644 --- a/gdb/testsuite/gdb.base/infcall-exec.exp +++ b/gdb/testsuite/gdb.base/infcall-exec.exp @@ -32,13 +32,21 @@ if {[gdb_compile $srcdir/$subdir/$srcfile2 $binfile2 executable debug] != ""} { return -1 } +if { [is_remote target] } { + set binfile2 [gdb_remote_download target $binfile2] +} + clean_restart $binfile if {![runto_main]} { return -1 } -set expected_result "process $decimal is executing new program: $binfile2" +set linenr [gdb_get_line_number "break here"] +gdb_breakpoint $linenr +gdb_continue_to_breakpoint "Ensure PATH is set" ".* break here .*" + +set expected_result "process $decimal is executing new program: \[^\r\n\]*$binfile2" append expected_result "\[\r\n\]+.*" append expected_result "Breakpoint 1, main .*at .*$srcfile2:$decimal" append expected_result ".*"
reply other threads:[~2022-11-15 14:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221115142520.9BD563896C09@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).