From patchwork Wed Mar 29 06:01:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67068 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 40BF238515D6 for ; Wed, 29 Mar 2023 06:02:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40BF238515D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069750; bh=6PVR5UyBY6n1Mg6KMJjUuZJoNanMqOdYgYGkmsthm0c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=RAifxnIRg5RJzsDFkb8u77FoMq00UchDZAXgYg+GPrY48HIJ1gpzCS6OlCw+DQ2ra aGvjWFfP88YE/tkejhePDi+aJtdoOWZS5us7dVHyU6TeA2PwcimW81PjnkyNIzZeQ7 L1HZk9eLfJXe1OX2Va+ip9mIJuzQ4FJzBNgPdGHc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 47BCE3858C54 for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 47BCE3858C54 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 704881FDF3 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 5E0B3139D3 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Ph/IFV3UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 1/6] [gdb/testsuite] Fix gdb.guile/guile.exp for remote host Date: Wed, 29 Mar 2023 08:01:59 +0200 Message-Id: <20230329060204.32690-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/guile.exp for remote host using gdb_remote_download. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/guile.exp | 38 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) base-commit: aec101ab06697221d2bc2f82b3a65fb92054ed9f diff --git a/gdb/testsuite/gdb.guile/guile.exp b/gdb/testsuite/gdb.guile/guile.exp index 4db2f7cd309..7d0c063583d 100644 --- a/gdb/testsuite/gdb.guile/guile.exp +++ b/gdb/testsuite/gdb.guile/guile.exp @@ -20,6 +20,8 @@ load_lib gdb-guile.exp clean_restart +set host_source2_scm [gdb_remote_download host $srcdir/$subdir/source2.scm] + # Do this instead of the skip_guile_check. # We want to do some tests when Guile is not present. gdb_test_multiple "guile (display 23) (newline)" "verify guile support" { @@ -32,7 +34,7 @@ gdb_test_multiple "guile (display 23) (newline)" "verify guile support" { # If Guile is not supported, verify that sourcing a guile script # causes an error. - gdb_test "source $srcdir/$subdir/source2.scm" \ + gdb_test "source $host_source2_scm" \ "Error in sourced command file:.*" \ "source source2.scm when guile disabled" @@ -63,7 +65,7 @@ gdb_test_multiline "show guile command" \ "end" "" \ "show user zzq" "User command \"zzq\":.* guile.*\\(print 23\\).* end" -gdb_test "source $srcdir/$subdir/source2.scm" "yes" "source source2.scm" +gdb_test "source $host_source2_scm" "yes" "source source2.scm" gdb_test "source -s source2.scm" "yes" @@ -81,19 +83,21 @@ gdb_test "guile (print a)" "= .*aliases -- User-defined aliases of other command "verify help to uiout" # Verify that we can source a guile script using ~ for the HOME directory. -save_vars { env(HOME) } { - # Create a new directory to act as a temporary HOME directory. - set tmp_home [standard_output_file tmp_home] - file mkdir $tmp_home - - # Copy the file we want to source into the new HOME directory. - gdb_remote_download host ${srcdir}/${subdir}/source2.scm \ - ${tmp_home}/source2.scm - - # Arrange to use the new HOME directory. - set env(HOME) $tmp_home - clean_restart - - # Finally, source the file out of our new HOME directory. - gdb_test "source ~/source2.scm" "yes" +if { ![is_remote host ] } { + save_vars { env(HOME) } { + # Create a new directory to act as a temporary HOME directory. + set tmp_home [standard_output_file tmp_home] + file mkdir $tmp_home + + # Copy the file we want to source into the new HOME directory. + gdb_remote_download host ${srcdir}/${subdir}/source2.scm \ + ${tmp_home}/source2.scm + + # Arrange to use the new HOME directory. + set env(HOME) $tmp_home + clean_restart + + # Finally, source the file out of our new HOME directory. + gdb_test "source ~/source2.scm" "yes" + } } From patchwork Wed Mar 29 06:02:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67069 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7FE503858020 for ; Wed, 29 Mar 2023 06:02:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7FE503858020 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069750; bh=m4BDxCJBEFp08TBSquJexEx6TH7Y30HfG1h5W0l0Udg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=C/kRwpY0eSchXnxab6gT8nUWTwMH/q5l6RA9+dxohQRN+J22/ODcryRbBlaE3VvDm Bn1I3sLKOHQP5BEVHkDhxvHJNm0k+rkbLByvSVsbc2mZ/HUqJM+g0PGJ7XsgsKlNNl XGJeqrEuQVKZQfp3XWedRw6sC0D/AH6XW6dWYOco= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 5ED82385840F for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5ED82385840F 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 867C11FDFC for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 74CCB13A18 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QBGEG13UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 2/6] [gdb/testsuite] Fix gdb.guile/scm-cmd.exp without readline Date: Wed, 29 Mar 2023 08:02:00 +0200 Message-Id: <20230329060204.32690-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329060204.32690-1-tdevries@suse.de> References: <20230329060204.32690-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/scm-cmd.exp using readline_is_used. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-cmd.exp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-cmd.exp b/gdb/testsuite/gdb.guile/scm-cmd.exp index a7fb59b0089..25a9780a4d5 100644 --- a/gdb/testsuite/gdb.guile/scm-cmd.exp +++ b/gdb/testsuite/gdb.guile/scm-cmd.exp @@ -149,14 +149,17 @@ gdb_test "complete expr-test bar\." \ "expr-test bar\.bc.*expr-test bar\.ij.*" \ "test completion through complete command" -set test "complete 'expr-test bar.i'" -send_gdb "expr-test bar\.i\t\t" -gdb_test_multiple "" "$test" { - -re "expr-test bar\.ij \\\x07$" { - send_gdb "\n" - gdb_test_multiple "" $test { - -re "invoked on = bar.ij.*$gdb_prompt $" { - pass "$test" + +if { [readline_is_used] } { + set test "complete 'expr-test bar.i'" + send_gdb "expr-test bar\.i\t\t" + gdb_test_multiple "" "$test" { + -re "expr-test bar\.ij \\\x07$" { + send_gdb "\n" + gdb_test_multiple "" $test { + -re "invoked on = bar.ij.*$gdb_prompt $" { + pass "$test" + } } } } From patchwork Wed Mar 29 06:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67071 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 103313857C55 for ; Wed, 29 Mar 2023 06:02:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 103313857C55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069778; bh=Cb/MpXi+wjpRTeVYT8CiBHotSVa80vymi8JqX87MGJE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TycUKwRwbL2DxQGbyuf/mSNO0FgVD26MNmpPwKUcvZ/m+FOApvJan4wtZtGcY/8JE Uc77pntrRWJkIR5tzA9woYGMBwdL9iigk082QV1mKnQmxYUZ+F8hv3rotdlYsyrOat yBejCgx9Loy5l1z9rTbHvDmZAlYBLO2EV9soNPIg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 7B23C385843A for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B23C385843A 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-out1.suse.de (Postfix) with ESMTPS id AC82D21A14 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 8DCEF139D3 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AFx4IV3UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 3/6] [gdb/testsuite] Fix gdb.guile/scm-objfile-script.exp for remote host Date: Wed, 29 Mar 2023 08:02:01 +0200 Message-Id: <20230329060204.32690-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329060204.32690-1-tdevries@suse.de> References: <20230329060204.32690-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/scm-objfile-script.exp using host_standard_output_file. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-objfile-script.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.guile/scm-objfile-script.exp b/gdb/testsuite/gdb.guile/scm-objfile-script.exp index 6a935d7926c..dc390b6b9ec 100644 --- a/gdb/testsuite/gdb.guile/scm-objfile-script.exp +++ b/gdb/testsuite/gdb.guile/scm-objfile-script.exp @@ -31,7 +31,7 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { # gdb will find it. set remote_guile_file [remote_download host \ ${srcdir}/${subdir}/${testfile}-gdb.in \ - [standard_output_file ${testfile}-gdb.scm]] + [host_standard_output_file ${testfile}-gdb.scm]] clean_restart gdb_test_no_output "set auto-load safe-path ${remote_guile_file}" \ From patchwork Wed Mar 29 06:02:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67070 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DBB003857B8E for ; Wed, 29 Mar 2023 06:02:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBB003857B8E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069757; bh=uCO79z8b3Fa2tPQPOhOgFqOt3yvjfF/98+p0D7xTyc8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=bUgLjfzDliO8WJr7gDYRuZqEX9CQBEFCi5S4FEtkEkohvZs4HDLBJlTdTQwlkh0P9 eLM9cjDnsAWM40Rv3X/BksF8fhDX7nKWD4VA32VVNB54+GKZmdZma9jd6EyrKDGPUo yutQ7gaA5+J9GJWckPh7smruGLLyAhCWG/lzTinU= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 972E23858289 for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 972E23858289 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-out1.suse.de (Postfix) with ESMTPS id C4F2221A18 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 AFFC113A18 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CDbZKV3UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 4/6] [gdb/testsuite] Fix gdb.guile/scm-objfile-script.exp for remote host Date: Wed, 29 Mar 2023 08:02:02 +0200 Message-Id: <20230329060204.32690-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329060204.32690-1-tdevries@suse.de> References: <20230329060204.32690-1-tdevries@suse.de> MIME-Version: 1.0 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/scm-objfile-script.exp using gdb_remote_download. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-objfile-script.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-objfile-script.exp b/gdb/testsuite/gdb.guile/scm-objfile-script.exp index dc390b6b9ec..89abc38ed3c 100644 --- a/gdb/testsuite/gdb.guile/scm-objfile-script.exp +++ b/gdb/testsuite/gdb.guile/scm-objfile-script.exp @@ -29,9 +29,9 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { # Make the -gdb.scm script available to gdb, it is automagically loaded by gdb. # Care is taken to put it in the same directory as the binary so that # gdb will find it. -set remote_guile_file [remote_download host \ +set remote_guile_file [gdb_remote_download host \ ${srcdir}/${subdir}/${testfile}-gdb.in \ - [host_standard_output_file ${testfile}-gdb.scm]] + ${testfile}-gdb.scm] clean_restart gdb_test_no_output "set auto-load safe-path ${remote_guile_file}" \ From patchwork Wed Mar 29 06:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67072 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AA4D93858C54 for ; Wed, 29 Mar 2023 06:03:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AA4D93858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069805; bh=myQGwbL4EhKv1O23N08fbG/S+zBdpvDSaNgvLBtOLZo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=QIVRM+yHfGNN3oDnfnaBOMGkYr54+2d+HD0CrMISxUuw7c80IVOjkOU1We82RINtH ytHdwzq3f5X/WX5anVjRFbbArU55udTOBzycMeqInxjf+u5PF3NWa1MLzt8BNYuQ9q xPoTJ/T+jiGJVwPl0pne87nsrYjUPExuCVtzUmsg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id A02D7385828E for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A02D7385828E 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-out1.suse.de (Postfix) with ESMTPS id D9473219CB for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 C8123139D3 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4Bi0L13UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 5/6] [gdb/testsuite] Fix /gdb.guile/scm-parameter.exp for remote host Date: Wed, 29 Mar 2023 08:02:03 +0200 Message-Id: <20230329060204.32690-5-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329060204.32690-1-tdevries@suse.de> References: <20230329060204.32690-1-tdevries@suse.de> MIME-Version: 1.0 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/scm-parameter.exp for remote host by taking into account that gdb_reinitialize_dir has no effect for remote host. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-parameter.exp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp index 2e9d9ed9a5d..e2f82a1e738 100644 --- a/gdb/testsuite/gdb.guile/scm-parameter.exp +++ b/gdb/testsuite/gdb.guile/scm-parameter.exp @@ -34,8 +34,15 @@ proc scm_param_test_maybe_no_output { command pattern args } { } # We use "." here instead of ":" so that this works on win32 too. -set escaped_directory [string_to_regexp "$srcdir/$subdir"] -gdb_test "guile (print (parameter-value \"directories\"))" "$escaped_directory.\\\$cdir.\\\$cwd" +if { [is_remote host] } { + # Proc gdb_reinitialize_dir has no effect for remote host. + gdb_test "guile (print (parameter-value \"directories\"))" \ + "\\\$cdir.\\\$cwd" +} else { + set escaped_directory [string_to_regexp "$srcdir/$subdir"] + gdb_test "guile (print (parameter-value \"directories\"))" \ + "$escaped_directory.\\\$cdir.\\\$cwd" +} # Test a simple boolean parameter, and parameter? while we're at it. From patchwork Wed Mar 29 06:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 67073 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 770653858C31 for ; Wed, 29 Mar 2023 06:03:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 770653858C31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680069833; bh=hTcKLXyVAoJGW/Vc85/qRADI47WdBY3OZO/aKI47LHk=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ybijLuUYOWfkjvYo4PCbvpILzAsI2qp5hEtczJfKqE3DtDHZawDEznSzTPCaBi6tb R0qaqxcs9jR5H/u2cTV7v/T/Ppu7Fr/qUge83PSmNv0vC5h0S79PxDvWQ526ZdPZuN 1U7Q1NbLYqD+0KJeTuKRwfxix1ni9g/VeAKExnWs= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id B7BDB3858296 for ; Wed, 29 Mar 2023 06:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B7BDB3858296 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 EF10C1FE00 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) 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 DD532139D3 for ; Wed, 29 Mar 2023 06:02:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yBf/NF3UI2RaEgAAMHmgww (envelope-from ) for ; Wed, 29 Mar 2023 06:02:05 +0000 To: gdb-patches@sourceware.org Subject: [pushed 6/6] [gdb/testsuite] Fix gdb.guile/scm-symbol.exp for remote host Date: Wed, 29 Mar 2023 08:02:04 +0200 Message-Id: <20230329060204.32690-6-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329060204.32690-1-tdevries@suse.de> References: <20230329060204.32690-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, 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 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-Patchwork-Original-From: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Fix test-case gdb.guile/scm-symbol.exp for remote host by making a regexp less strict. Likewise in gdb.guile/scm-symtab.exp. Tested on x86_64-linux. --- gdb/testsuite/gdb.guile/scm-symbol.exp | 2 +- gdb/testsuite/gdb.guile/scm-symtab.exp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp index 5680a7f176a..8c6cbd250ae 100644 --- a/gdb/testsuite/gdb.guile/scm-symbol.exp +++ b/gdb/testsuite/gdb.guile/scm-symbol.exp @@ -132,7 +132,7 @@ gdb_test "guile (print (= (symbol-addr-class t) SYMBOL_LOC_CONST))" "= #t" gdb_test "guile (print (symbol-type t))" "= enum tag" # Test symtab attribute. -gdb_test "guile (print (symbol-symtab t))" "= #" +gdb_test "guile (print (symbol-symtab t))" "= #" # C++ tests # Recompile binary. diff --git a/gdb/testsuite/gdb.guile/scm-symtab.exp b/gdb/testsuite/gdb.guile/scm-symtab.exp index 0f468b7d373..a8cc2825ae0 100644 --- a/gdb/testsuite/gdb.guile/scm-symtab.exp +++ b/gdb/testsuite/gdb.guile/scm-symtab.exp @@ -61,7 +61,7 @@ gdb_scm_test_silent_cmd "guile (define new-pc (sal-pc (frame-sal (selected-frame # Test sal. gdb_test "guile (print (sal-symtab sal))" \ - ".*gdb.guile/scm-symtab.c.*" "Test sal-symtab" + " (.*/)?scm-symtab.c.*" "Test sal-symtab" gdb_test "guile (print (sal-pc sal))" \ "${decimal}" "test sal-pc" gdb_test "guile (print (= (sal-last sal) (- new-pc 1)))" \ @@ -85,11 +85,16 @@ gdb_test "guile (print (eq? symtab (symbol-symtab (lookup-global-symbol \"func1\ # Test symbol table. gdb_test "guile (print (symtab-filename symtab))" \ - ".*gdb.guile/scm-symtab.c.*" "test symtab-filename" + " (.*/)?scm-symtab.c.*" "test symtab-filename" gdb_test "guile (print (symtab-objfile symtab))" \ "#" "test symtab-objfile" -gdb_test "guile (print (symtab-fullname symtab))" \ - "testsuite/gdb.guile/scm-symtab.c.*" "test symtab-fullname" +if { [is_remote host] } { + gdb_test "guile (print (symtab-fullname symtab))" \ + " (.*/)scm-symtab.c.*" "test symtab-fullname" +} else { + gdb_test "guile (print (symtab-fullname symtab))" \ + "testsuite/gdb.guile/scm-symtab.c.*" "test symtab-fullname" +} gdb_test "guile (print (symtab-valid? symtab))" \ "#t" "test symtab-valid?" gdb_test "guile (print (->bool (member \"qq\" global-symbols)))" \