From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by sourceware.org (Postfix) with ESMTPS id 9FBC03888C60 for ; Wed, 30 Mar 2022 19:29:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9FBC03888C60 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f41.google.com with SMTP id r7so12911836wmq.2 for ; Wed, 30 Mar 2022 12:29:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UvIzPMTur2PUP1z10VAh63nNpUigTTibyvN+RY3MO6w=; b=7iWms7eo/mJ+/4LITMqWV1M8/c0MmM69N7EhNV8oYZgZLXY34ChBlmRWkiEtljwquR PileZYf2/C+UHcOEjAei6knp4ixIzsfCy587VNME/HfaK6IV7UqZZ8CSgnwVbPef5mva uSyMcHYUjIPQ/0EvQabTOLCZnrqXEFwEqPfMepmBYpugv3DIhy9snabb24Tk9FJj0AQC PLz98wRxZCJpB34nkG2LjSoQoOhcn9owIesgcLZUuCUSxOL3OSO4vvAp3qXH+I94IDmk 5IGcal/Qb0Y/Qq9cZr/2ivfUX0SSlyDaSzo89uG8eO5/2Yp58EiS+k9ea9HrdZWMq2KE mpow== X-Gm-Message-State: AOAM530R/6w6584HQSYnKWp+sFVroVDHs735JOe8TvPr7uv2YUSb5gXq mPVMPKaxTcawkRkWEmifikgy1fdUHqc= X-Google-Smtp-Source: ABdhPJw9wpuwa93u3hjZD2jurtPkeCQLR/TGqJIxFcnlu7k0xJQSuRJFQcXsTX7M/wtC/2S22csN2g== X-Received: by 2002:a1c:f009:0:b0:387:6fea:8ebc with SMTP id a9-20020a1cf009000000b003876fea8ebcmr1144233wmb.84.1648668575929; Wed, 30 Mar 2022 12:29:35 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id p8-20020a5d4e08000000b002054b5437f2sm17591504wrt.115.2022.03.30.12.29.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Mar 2022 12:29:34 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/5] gdb.base/scope.exp: Remove bogus gdb_test questions Date: Wed, 30 Mar 2022 20:29:26 +0100 Message-Id: <20220330192929.3161015-3-pedro@palves.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220330192929.3161015-1-pedro@palves.net> References: <20220330192929.3161015-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Wed, 30 Mar 2022 19:29:40 -0000 This test is abusing the QUESTION/RESPONSE feature to send an alternative command to GDB if the first command fails. Like so: gdb_test "print 'scope0.c'::filelocal" \ "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" \ "No symbol \"scope0.c\" in current context.*" \ "print '$srcdir/$subdir/scope0.c'::filelocal" So if 'scope0.c' doesn't work, we try again with '$srcdir/$subdir/scope0.c'. I strongly suspect this is really an obsolete test. I think that if '$srcdir/$subdir/scope0.c' works, then 'scope0.c' should have worked too, thus I'd think that if we pass due to the question path, then it's a bug. So just remove the question part passed to gdb_test. Change-Id: I2acc99285f1d519284051b49693b5441fbdfe3cd --- gdb/testsuite/gdb.base/scope.exp | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 19a85bcd244..a8ddb61350a 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -49,11 +49,11 @@ proc_with_prefix test_at_main {} { # Print scope0.c::filelocal, which is 1 gdb_test "print filelocal" "\\\$$decimal = 1" - gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" # Print scope0.c::filelocal_bss, which is 101 gdb_test "print filelocal_bss" "\\\$$decimal = 101" - gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main" # Print scope0.c::filelocal_ro, which is 201 @@ -62,37 +62,37 @@ proc_with_prefix test_at_main {} { gdb_test "print filelocal_ro" "\\\$$decimal = 201" "print filelocal_ro in test_at_main" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" # Print scope1.c::filelocal, which is 2 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal" # Print scope1.c::filelocal_bss, which is 102 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss" + gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss" # Print scope1.c::filelocal_ro, which is 202 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro" + gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" # Print scope1.c::foo::funclocal, which is 3 gdb_test "print foo::funclocal" "\\\$$decimal = 3" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal" + gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal" # Print scope1.c::foo::funclocal_ro, which is 203 gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro" + gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro" # Print scope1.c::bar::funclocal, which is 4 gdb_test "print bar::funclocal" "\\\$$decimal = 4" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" + gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal" } proc_with_prefix test_at_foo {} { @@ -105,34 +105,34 @@ proc_with_prefix test_at_foo {} { gdb_test "next" ".*bar \\(\\);" # Print scope0.c::filelocal, which is 1 - gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo" # Print scope0.c::filelocal_bss, which is 101 - gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo" # Print scope0.c::filelocal_ro, which is 201 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" # Print scope1.c::filelocal, which is 2 gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo" gdb_test "print filelocal_bss" "\\\$$decimal = 102" \ "print filelocal_bss at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss" + gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at foo" gdb_test "print filelocal_ro" "\\\$$decimal = 202" \ "print filelocal_ro at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro" + gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at foo" # Print scope1.c::foo::funclocal, which is 3 @@ -143,7 +143,7 @@ proc_with_prefix test_at_foo {} { "print foo::funclocal at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal" + gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at foo" # Print scope1.c::foo::funclocal_bss, which is 103 @@ -155,7 +155,7 @@ proc_with_prefix test_at_foo {} { "print foo::funclocal_bss at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss" + gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at foo" # Print scope1.c::foo::funclocal_ro, which is 203 @@ -167,7 +167,7 @@ proc_with_prefix test_at_foo {} { "print foo::funclocal_ro at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro" + gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at foo" # Print scope1.c::bar::funclocal, which is 4 @@ -176,7 +176,7 @@ proc_with_prefix test_at_foo {} { "print bar::funclocal at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" + gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at foo" } @@ -190,64 +190,64 @@ proc_with_prefix test_at_bar {} { gdb_test "next" # Print scope0.c::filelocal, which is 1 - gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar" # Print scope0.c::filelocal_bss, which is 101 - gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar" # Print scope0.c::filelocal_ro, which is 201 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar" # Print scope1.c::filelocal, which is 2 gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar" # Print scope1.c::filelocal_bss, which is 102 gdb_test "print filelocal_bss" "\\\$$decimal = 102" "print filelocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss" + gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar" # Print scope1.c::filelocal_ro, which is 202 gdb_test "print filelocal_ro" "\\\$$decimal = 202" "print filelocal_ro in test_at_bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro" + gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar" # Print scope1.c::foo::funclocal, which is 3 gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal" + gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar" # Print scope1.c::foo::funclocal_bss, which is 103 gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" "print foo::funclocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss" + gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar" # Print scope1.c::foo::funclocal_ro, which is 203 gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro" + gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar" # Print scope1.c::bar::funclocal, which is 4 gdb_test "print funclocal" "\\\$$decimal = 4" "print funclocal at bar" gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" + gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar" # Print scope1.c::bar::funclocal_bss, which is 104 gdb_test "print funclocal_bss" "\\\$$decimal = 104" "print funclocal_bss at bar" gdb_test "print bar::funclocal_bss" "\\\$$decimal = 104" "print bar::funclocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal_bss" + gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar" } # This test has little to do with local scopes, but it is in scope.exp anyway. -- 2.26.2