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 0854B38582BE for ; Thu, 9 Mar 2023 09:45:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0854B38582BE 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 3E9031FFC8 for ; Thu, 9 Mar 2023 09:45:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678355135; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sN9up/5d0OD9S0hVmp8XLSSoWdHplL1SFl5OAo5CbA8=; b=WpOvSTMr8RT/8aTkgF0TcveFKB/AozIErmaY7tDE9haR9/DohSdL6L1OJyqd2Ra1cNDMl0 5IPuJG4BX6c5WtxdvUal/4YW4zY67zOoL4JREb0TCvukl6MQSaO5mrqSPcOeA5WtBSSD9X fcCoghti1sFJlgMBVoFvTCquhIbTcTk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678355135; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sN9up/5d0OD9S0hVmp8XLSSoWdHplL1SFl5OAo5CbA8=; b=rZQ4b5S2qzb3n0ZDdhpeLCuQZdRlVib+9nfS2OhNtoMXJdE7M2EGbAjFx1Dqi4LyoZS2kL LuJajbzfxBv0J8Cw== 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 2AF521391B for ; Thu, 9 Mar 2023 09:45:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MNNhCb+qCWS8FwAAMHmgww (envelope-from ) for ; Thu, 09 Mar 2023 09:45:35 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/7] [gdb/testsuite] Fix gdb.server/sysroot.exp for remote target Date: Thu, 9 Mar 2023 10:45:42 +0100 Message-Id: <20230309094545.4537-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230309094545.4537-1-tdevries@suse.de> References: <20230309094545.4537-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: Fix test-case gdb.server/sysroot.exp with target board remote-gdbserver-on-localhost, by: - using gdb_remote_download, and - disabling the "local" scenario for remote host. Tested on x86_64-linux. --- gdb/testsuite/gdb.server/sysroot.exp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.server/sysroot.exp index 715d6001020..ac2a03d0c8f 100644 --- a/gdb/testsuite/gdb.server/sysroot.exp +++ b/gdb/testsuite/gdb.server/sysroot.exp @@ -27,9 +27,17 @@ if {[build_executable "failed to prepare" $testfile $srcfile "additional_flags=- return -1 } +set target_binfile [gdb_remote_download target $binfile] + # Run once with sysroot set to the local filesystem and once set to the remote # target. -foreach_with_prefix sysroot { "local" "remote" } { +set modes {} +if { ![is_remote target] } { + lappend modes "local" +} +lappend modes "remote" + +foreach_with_prefix sysroot $modes { global srcdir global subdir global binfile @@ -40,7 +48,7 @@ foreach_with_prefix sysroot { "local" "remote" } { set timeout_factor 1 } else { set sysroot_command "target:" - set reading_symbols "Reading $binfile from remote target..." + set reading_symbols "Reading .*$target_binfile from remote target..." set timeout_factor 5 } @@ -55,7 +63,7 @@ foreach_with_prefix sysroot { "local" "remote" } { gdb_test "disconnect" ".*" # Start GDBserver. - set res [gdbserver_start "" $binfile] + set res [gdbserver_start "" $target_binfile] set gdbserver_protocol [lindex $res 0] set gdbserver_gdbport [lindex $res 1] -- 2.35.3