From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id TTA9CYqee2KKnwUAWB0awg (envelope-from ) for ; Wed, 11 May 2022 07:31:22 -0400 Received: by simark.ca (Postfix, from userid 112) id 1A5EA1E21F; Wed, 11 May 2022 07:31:22 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=xCQoNViS; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9C1881E01D for ; Wed, 11 May 2022 07:31:21 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 243223851406 for ; Wed, 11 May 2022 11:31:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 243223851406 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1652268681; bh=4I+L5yCe+ke2QHV/Rfc7jmXdb4e0tGDUQYnJ0SPcF+s=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xCQoNViSjY6XGyfadxNAq0nwADoMMBHU8JNhWowFBt/ZV5SAmq4SqdMv8I9YmsrJ9 yfxzMrEzayMkTnKiV8p6ilEq1/roQkpXdkB2FK0cARKstXGgqQ2N2xMtnES/RqizG2 ZPeoDnZ6OPidZYNiNIBgio/p4jfnj3gmnznYfRIM= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id AA73D3858401 for ; Wed, 11 May 2022 11:31:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AA73D3858401 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 E0D0721A24 for ; Wed, 11 May 2022 11:31:00 +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 C519513A76 for ; Wed, 11 May 2022 11:31:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id NMzaLnSee2LiSQAAMHmgww (envelope-from ) for ; Wed, 11 May 2022 11:31:00 +0000 Date: Wed, 11 May 2022 13:30:59 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.base/catch-syscall.exp without --enable-targets Message-ID: <20220511113055.GA1134@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When doing a gdb build without --enable-targets, I run into: ... (gdb) UNSUPPORTED: gdb.base/catch-syscall.exp: multiple targets: \ s390:31-bit vs s390:64-bit: set architecture s390:64-bit delete breakpoints^M (gdb) info breakpoints^M No breakpoints or watchpoints.^M (gdb) break -qualified main^M No symbol table is loaded. Use the "file" command.^M Make breakpoint pending on future shared library load? (y or [n]) n^M (gdb) FAIL: gdb.base/catch-syscall.exp: gdb_breakpoint: set breakpoint at main ... The problem is that due to recent commit e21d8399303 ("[gdb/testsuite] Remove target limits in gdb.base/catch-syscall.exp") "clean_restart $binfile" no longer is called at the end of test_catch_syscall_multi_arch. Fix this by moving "clean_restart $binfile" back to test_catch_syscall_multi_arch. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.base/catch-syscall.exp without --enable-targets --- gdb/testsuite/gdb.base/catch-syscall.exp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index fed0e7b774c..1260a64270f 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -568,7 +568,7 @@ proc test_catch_syscall_with_wrong_args_noxml {} { proc test_catch_syscall_multi_arch_1 { arch1 arch2 syscall1_name syscall2_name syscall_number } { - global decimal binfile + global decimal with_test_prefix "multiple targets: $arch1 vs $arch2" { # We are not interested in loading any binary here, and in @@ -605,12 +605,12 @@ proc test_catch_syscall_multi_arch_1 { gdb_test "catch syscall $syscall_number" \ "Catchpoint $decimal \\(syscall .${syscall2_name}. \\\[${syscall_number}\\\]\\)" \ "insert catch syscall on syscall $syscall_number -- $syscall2_name on $arch2" - - clean_restart $binfile } } proc test_catch_syscall_multi_arch {} { + global binfile + set arch1 "i386" set arch2 "i386:x86-64" set syscall1_name "exit" @@ -650,6 +650,8 @@ proc test_catch_syscall_multi_arch {} { set syscall_number 142 test_catch_syscall_multi_arch_1 $arch1 $arch2 $syscall1_name \ $syscall2_name $syscall_number + + clean_restart $binfile } proc do_syscall_tests_without_xml {} {