From patchwork Thu Dec 8 15:38:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 61700 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 0C2F53AA983C for ; Thu, 8 Dec 2022 15:39:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C2F53AA983C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670513950; bh=8ROqOuItzwEOFU0c5MLVDwaLU6bJP+EEZyhIaReF5CA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=TsawLVCoKOakBpttU1bK38HcYCwhLii8F8jcVnmCMDQ9p9tdDpzuNVgJ/4cMr82YK LdJLelBDHNYjcsjejkzS6NOXafLbX9WicCZ6dr3ghrsR4zgbH1Cxjzp1NfUf2Z0s/4 ifnX2VSZi2JzaweT9cfFhDeuesOgzdf3QvN3JAWc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C084239385B5 for ; Thu, 8 Dec 2022 15:38:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C084239385B5 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-374-yO6WOieAOiqFBMwb4H_fhw-1; Thu, 08 Dec 2022 10:38:39 -0500 X-MC-Unique: yO6WOieAOiqFBMwb4H_fhw-1 Received: by mail-wm1-f70.google.com with SMTP id n2-20020a05600c3b8200b003d07aea2209so2968794wms.1 for ; Thu, 08 Dec 2022 07:38:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8ROqOuItzwEOFU0c5MLVDwaLU6bJP+EEZyhIaReF5CA=; b=e3aUcg2vX1v+D8cBhxogIXICKrwp055IF/D6Q9dER5h9vDTwT+x8Bd0YJ19I7Kyiju ufd9/UkB9ib35F4oZeOx8NbO//hL8caoIJaQHI8XRS4wMAf4KXSuQXLMIbdxe6SK2S07 /wNoYL9ZYqZas/hknRyG3MhFLQ+kErLB71mypKja+M6ZY0/RyzqKGW03x5LlTp9NDGch u03lCARjqVcNT5eFUkTGnCS80pCr21Vp4RD+DYDx4iVvlA5xtN1N3zPu5DqOAu4psRaw dOgYj+WZOj+6c8e1tZWeL/5CBAXyoSs6rr/t8CiwdYKNNoHkHigvxBgQnCJRfSVbB+p2 Y6CQ== X-Gm-Message-State: ANoB5pmuzqNTis4bR2IJT0zLHsm2PATx7o+simdEUSe2ZIDyPTHXIvVu 4BVClyA3385OeQaXlfEZUrCzXlIHLw+1utBB9DI3pLrQP5XrUbJIcwRuq2i64AJcbzhhzvJId7W wcTWiqByqf/ErFBAD/U6f67bgj+1GS01OWiAHjnUXkMeV0ciZKAU6WWCZzB7BKon9wruFjOKQgA == X-Received: by 2002:adf:a4d0:0:b0:242:3be9:71c5 with SMTP id h16-20020adfa4d0000000b002423be971c5mr1714039wrb.54.1670513917956; Thu, 08 Dec 2022 07:38:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Qh5turL6C4Rn5D2/rtL3oT/9q4CpWxhR+d/K+ujSB0oUW+y4JEb/ITPktwOiZO5u+aFg7jw== X-Received: by 2002:adf:a4d0:0:b0:242:3be9:71c5 with SMTP id h16-20020adfa4d0000000b002423be971c5mr1714019wrb.54.1670513917268; Thu, 08 Dec 2022 07:38:37 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id l7-20020a5d4107000000b00242246c2f7csm22485582wrp.101.2022.12.08.07.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 07:38:36 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey , Andrew Burgess Subject: [PATCH 1/2] gdb/testsuite: fix readnow detection Date: Thu, 8 Dec 2022 15:38:32 +0000 Message-Id: <69eaee80b5b0a72649d6046d9d63d90938e67e14.1670513780.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The following commit broke the readnow detection in the testsuite: commit dfaa040b440084dd73ebd359326752d5f44fc02c Date: Mon Mar 29 18:31:31 2021 -0600 Remove some "OBJF_READNOW" code from dwarf2_debug_names_index The testsuite checks if GDB was started with the -readnow flag by using the 'maintenance print objfiles' command, and looking for the string 'faked for "readnow"' in the output. This is implemented in two helper procs `readnow` (gdb.exp) and `mi_readnow` (mi-support.exp). The following tests all currently depend on this detection: gdb.base/maint.exp gdb.cp/nsalias.exp gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp gdb.dwarf2/dw2-stack-boundary.exp gdb.dwarf2/dw2-zero-range.exp gdb.dwarf2/gdb-index-nodebug.exp gdb.mi/mi-info-sources.exp gdb.python/py-symbol.exp gdb.rust/traits.exp The following test also includes detection of 'readnow', but does the detection itself by checking $::GDBFLAGS for the readnow flag: gdb.opt/break-on-_exit.exp The above commit removed from GDB the code that produced the 'faked for "readnow"' string, as a consequence the testsuite can no longer correctly spot when readnow is in use, and many of the above tests will fail (at least partially). When looking at the above tests, I noticed that gdb.rust/traits.exp does call `readnow`, but doesn't actually use the result, so I've removed the readnow call, this simplifies the next part of this patch as gdb.rust/traits.exp was the only place an extra regexp was passed to the readnow call. Next I have rewritten `readnow` to check the $GDBFLAGS for the -readnow flag, and removed the `maintenance print objfiles` check. At least for all the tests above, when using the readnow board, this is good enough to get everything passing again. For the `mi_readnow` proc, I changed this to just call `readnow` from gdb.exp, I left the mi_readnow name in place - in the future it might be the case that we want to do some different checks here. Finally, I updated gdb.opt/break-on-_exit.exp to call the `readnow` proc. With these changes, all of the tests listed above now pass correctly when using the readnow board. --- gdb/testsuite/gdb.opt/break-on-_exit.exp | 3 +-- gdb/testsuite/gdb.rust/traits.exp | 2 -- gdb/testsuite/lib/gdb.exp | 30 ++++-------------------- gdb/testsuite/lib/mi-support.exp | 28 ++++------------------ 4 files changed, 10 insertions(+), 53 deletions(-) diff --git a/gdb/testsuite/gdb.opt/break-on-_exit.exp b/gdb/testsuite/gdb.opt/break-on-_exit.exp index 7c2fda6af69..3d18cd70bb9 100644 --- a/gdb/testsuite/gdb.opt/break-on-_exit.exp +++ b/gdb/testsuite/gdb.opt/break-on-_exit.exp @@ -36,8 +36,7 @@ standard_testfile # See if we have target board readnow.exp or similar. -if { [lsearch -exact $GDBFLAGS -readnow] != -1 \ - || [lsearch -exact $GDBFLAGS --readnow] != -1 } { +if {[readnow]} { untested "--readnever not allowed in combination with --readnow" return -1 } diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index aa45e64b877..949e7cb919e 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -43,7 +43,5 @@ if {![runto ${srcfile}:$line]} { return -1 } -set readnow_p [readnow $binfile] - gdb_test "print *td" " = 23.5" gdb_test "print *tu" " = 23" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 008f59b9f30..132d538957c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8553,32 +8553,12 @@ gdb_caching_proc supports_fcf_protection { } executable "additional_flags=-fcf-protection=full"] } -# Return 1 if symbols were read in using -readnow. Otherwise, return 0. +# Return true if symbols were read in using -readnow. Otherwise, +# return false. -proc readnow { args } { - if { [llength $args] == 1 } { - set re [lindex $args 0] - } else { - set re "" - } - - set readnow_p 0 - # Given the listing from the following command can be very verbose, match - # the patterns line-by-line. This prevents timeouts from waiting for - # too much data to come at once. - set cmd "maint print objfiles $re" - gdb_test_multiple $cmd "" -lbl { - -re "\r\n.gdb_index: faked for \"readnow\"" { - # Record the we've seen the above pattern. - set readnow_p 1 - exp_continue - } - -re -wrap "" { - # We don't care about any other input. - } - } - - return $readnow_p +proc readnow { } { + return [expr {[lsearch -exact $::GDBFLAGS -readnow] != -1 + || [lsearch -exact $::GDBFLAGS --readnow] != -1}] } # Return index name if symbols were read in using an index. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 18a2a04def8..2dccb8924b1 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -671,32 +671,12 @@ proc mi_gdb_load { arg } { return 0 } -# Return 1 if symbols were read in using -readnow. Otherwise, return 0. -# Based on readnow from lib/gdb.exp. +# Return true if symbols were read in using -readnow. Otherwise, +# return false. proc mi_readnow { args } { - global mi_gdb_prompt - - if { [llength $args] == 1 } { - set re [lindex $args 0] - } else { - set re "" - } - - set readnow_p 0 - set cmd "maint print objfiles $re" - send_gdb "$cmd\n" - gdb_expect { - -re ".gdb_index: faked for ..readnow.." { - # Record that we've seen the above pattern. - set readnow_p 1 - exp_continue - } - -re "\\^done\r\n$mi_gdb_prompt$" { - } - } - - return $readnow_p + # Just defer to gdb.exp. + return [readnow] } # mi_gdb_test COMMAND [PATTERN [MESSAGE [IPATTERN]]] -- send a command to gdb;