From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id A3FCD3858D32 for ; Mon, 7 Nov 2022 16:18:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3FCD3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C76E91F383; Mon, 7 Nov 2022 16:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1667837910; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PHnWkPLkFW+x926yc8flUkHqYg5b3Ufhnp0u1/I7KKU=; b=ERE0KVQ5RnlANpWrrjIFXg+0PbyqlgMhv+oWZfY5FjQyYB6QRKXjImeHjP9rKpjLbx+ntw qU2tzrdpofXY+qaEFZfMim/e+V6ai193k5XiPZWcUutYMOKR+DzkqGuiVB4yggwgoCI7lM Cf2zhIletDcAU5aBVy0hIkkqA065m4E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1667837910; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PHnWkPLkFW+x926yc8flUkHqYg5b3Ufhnp0u1/I7KKU=; b=5zdg/M2ho9z7ZTcvnb2x9Ybobo4bNs6JESdIrqOUM4vGAy9iYQfdpv3rmp3GlJrB5/gQ/Z lhHOrJ2dCKDBwHBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A8BF513494; Mon, 7 Nov 2022 16:18:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id C40cKNYvaWMJVAAAMHmgww (envelope-from ); Mon, 07 Nov 2022 16:18:30 +0000 Message-ID: <57570e96-e381-c4f2-3c74-cc40fdda763e@suse.de> Date: Mon, 7 Nov 2022 17:18:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: Re: [PATCH 2/7] [gdb/testsuite] fix test gdb.base/print-file-var.exp for remote execution Content-Language: en-US To: Andrew Burgess , Ivan Tetyushkin , gdb-patches@sourceware.org, Andrew Burgess References: <20221025162946.727169-1-ivan.tetyushkin@syntacore.com> <20221025162946.727169-3-ivan.tetyushkin@syntacore.com> <87cz9yc2kz.fsf@redhat.com> From: Tom de Vries In-Reply-To: <87cz9yc2kz.fsf@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 11/7/22 14:32, Andrew Burgess wrote: > Tom de Vries via Gdb-patches writes: > >> On 10/25/22 18:29, Ivan Tetyushkin wrote: >>> --- >>> gdb/testsuite/gdb.base/print-file-var.exp | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp >>> index 9abe87d7758..73137630fed 100644 >>> --- a/gdb/testsuite/gdb.base/print-file-var.exp >>> +++ b/gdb/testsuite/gdb.base/print-file-var.exp >>> @@ -42,6 +42,8 @@ proc test {hidden dlopen version_id_main lang} { >>> set libobj1 [standard_output_file ${lib1}$suffix.so] >>> set libobj2 [standard_output_file ${lib2}$suffix.so] >>> >>> + set runtimelibobj2 [get_runtime_file $libobj2] >>> + >>> set lib_opts { debug $lang } >>> lappend lib_opts "additional_flags=-DHIDDEN=$hidden" >>> >>> @@ -60,7 +62,7 @@ proc test {hidden dlopen version_id_main lang} { >>> set link_opts [list debug shlib=${libobj1}] >>> >>> if {$dlopen} { >>> - lappend main_opts "additional_flags=-DSHLIB_NAME=\"$libobj2\"" >>> + lappend main_opts "additional_flags=-DSHLIB_NAME=\"$runtimelibobj2\"" >>> lappend link_opts "shlib_load" >>> } else { >>> lappend link_opts "shlib=${libobj2}" >> >> I get this test-case passing by avoiding to use an absolute file name: >> ... >> diff --git a/gdb/testsuite/gdb.base/print-file-var.exp >> b/gdb/testsuite/gdb.base/print-file- >> var.exp >> index 9abe87d7758..338840cb05e 100644 >> --- a/gdb/testsuite/gdb.base/print-file-var.exp >> +++ b/gdb/testsuite/gdb.base/print-file-var.exp >> @@ -60,7 +60,7 @@ proc test {hidden dlopen version_id_main lang} { >> set link_opts [list debug shlib=${libobj1}] >> >> if {$dlopen} { >> - lappend main_opts "additional_flags=-DSHLIB_NAME=\"$libobj2\"" >> + lappend main_opts "additional_flags=-DSHLIB_NAME=\"[file tail >> $libobj2]\"" >> lappend link_opts "shlib_load" >> } else { >> lappend link_opts "shlib=${libobj2}" >> ... >> which means that the file is found relative to $ORIGIN, as is the case >> for $dlopen == 0. >> >> I'm not entirely happy with this fix, because what we'd rather want is >> to use the name as returned by remote_download, but that's done in >> gdb_load_shlib later on (which also handles shlib_target_file, so >> actually, the name as returned by this proc is the one we really want), >> so it's not available yet at the time we do the compilation. >> >> I've thought about allowing gdb_load_shlib to be called without gdb >> instance, and for cases where there's no instance, registering the >> solib-search-path setting to be done at gdb start. This will allow us >> to move the gdb_load_shlib calls to before the compilation, such that we >> can use the result to set -DSHLIB_NAME. But I think it's a solution >> bound to cause confusion because things happen under the hood. >> >> Alternatively, we can try to not pass in the name into compilation >> (working around only some of the problems related to remote host >> testing, see https://sourceware.org/bugzilla/show_bug.cgi?id=16947), but >> that also has its limitations: we need to be able to patch target memory >> or the ability to use argv. >> >> Perhaps splitting up the functionality in gdb_load_shlib makes the most >> sense. By default, it'll do the same as before, but by calling it >> twice, once with -only-download, and once with -no-download can we get >> the solib name before starting gdb. >> >> I've given this a try in patch attached below. > > I also prefer the approach that Tom has suggested here. I gave the > patch a go and it fixed the problems in print_file-var.exp for me using > a local/remote type setup. > Thanks for confirming. >> >> Ivan, could you check if the patch fixes the gdb.base/print-file-var.exp >> test-case for you? >> >> Thanks, >> - Tom >> From b072645433f83d62a4b7cf857d3d50f0dd7e0c75 Mon Sep 17 00:00:00 2001 >> From: Tom de Vries >> Date: Sun, 6 Nov 2022 11:26:23 +0100 >> Subject: [PATCH 3/3] [gdb/testsuite] Fix gdb.base/print-file-var.exp for >> remote target >> >> --- >> gdb/testsuite/gdb.base/print-file-var.exp | 6 ++- >> gdb/testsuite/lib/gdb.exp | 48 +++++++++++++++++------ >> 2 files changed, 39 insertions(+), 15 deletions(-) >> >> diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp >> index 9abe87d7758..abdbbbfdce4 100644 >> --- a/gdb/testsuite/gdb.base/print-file-var.exp >> +++ b/gdb/testsuite/gdb.base/print-file-var.exp >> @@ -59,8 +59,10 @@ proc test {hidden dlopen version_id_main lang} { >> set main_opts [list debug $lang] >> set link_opts [list debug shlib=${libobj1}] >> >> + set target_libobj2 [gdb_load_shlib $libobj2 -only-download] >> + >> if {$dlopen} { >> - lappend main_opts "additional_flags=-DSHLIB_NAME=\"$libobj2\"" >> + lappend main_opts "additional_flags=-DSHLIB_NAME=\"$target_libobj2\"" >> lappend link_opts "shlib_load" >> } else { >> lappend link_opts "shlib=${libobj2}" >> @@ -79,7 +81,7 @@ proc test {hidden dlopen version_id_main lang} { >> >> clean_restart $executable >> gdb_load_shlib $libobj1 >> - gdb_load_shlib $libobj2 >> + gdb_load_shlib $libobj2 -no-download >> >> if ![runto_main] { >> return -1 >> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp >> index e2cda30b95a..5328afb27e8 100644 >> --- a/gdb/testsuite/lib/gdb.exp >> +++ b/gdb/testsuite/lib/gdb.exp >> @@ -5873,24 +5873,46 @@ proc gdb_remote_download {dest fromfile {tofile {}}} { >> # >> # Copy the listed library to the target. >> >> -proc gdb_load_shlib { file } { >> +proc gdb_load_shlib { file args } { >> global gdb_spawn_id > > The comments on this function will need updating for a final version of > this patch. > > Otherwise, looks good. Ack, and thanks for the review. Thanks, - Tom