From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id B6B70385BF9E for ; Wed, 17 Mar 2021 11:24:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B6B70385BF9E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x32e.google.com with SMTP id a132-20020a1c668a0000b029010f141fe7c2so939114wmc.0 for ; Wed, 17 Mar 2021 04:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xWA/EifVnTk/8HBqhq33/2+UVwp9fSAItbm3yBaaaQs=; b=CbBEEfX75cYDd4QaG0AjmzOL3DB4MmgAqPOZBqLyvU8jzOYW7kwSjeKQA6O5FPmArE ghFGLM/I7WELuzNPN5NqUNtrDpS9M4YQ2hMSppMhZ+PEL6bLTAh5lojOBpJijolknpeA F0dQfI9Hc3Iz3Pa8eyCpKqaydRmKjAkRpubR9IAGpZePuvXA2efO8I5L6jeyfdH1TheT Z7iwIQuDknpplPDFZUA8ZPbawuQzP1IbFtZf2Vmu9om+ryrV76z26ohJXxairSCQFp6E IpyuxauliBvXb8FgMPEBL4WCGYuVTekLuzD5cXghySnwSa/qFfIclh1HVBE/japX9MZU lmJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xWA/EifVnTk/8HBqhq33/2+UVwp9fSAItbm3yBaaaQs=; b=SF+ej7SjxT2esyDvKBenEgwXUBT14fY3hIU4u4fIIlxkOd1JYHX4Psl1Ar9RIhu6u6 HwvqH6/wGHrajnH2dh6FNlHYGO63vOCjFcfNFyEzkzzwNNHVfxLcW9XjGYrMI2z5E/bu if6Uz6FbaxnZTAZU2QkqHX5XZSnMFMCpthlfjta+QCWdnW/SmMgc9t6jsjUPXKLg7lUv TZbKtNYxGRkzY6E6mPsJuyFBpgw9pZR1EoGx0jlXH9BmoW4Ox7hTpwcKrs7om2E4mee7 uncIe9Zad32XZPBB60f2GB8dyzciifN623iS6Bub6P5LbZTrF3p4wATnMEQp943iyG0U jMDw== X-Gm-Message-State: AOAM533u25ciXwHXf7949zP0junPIxnPxJ/EpGcvRkE30mJxNNFrxmgF 7xa00nneh+mQqCZiKMb/7iKF6Fb64BYtxQ== X-Google-Smtp-Source: ABdhPJzwZu14dJye0G1+sPYe27RpCeHrj2ZIcsLM++xjQRaOf8HtO3CUvdwneLlwgyyg0hLvC/S7aw== X-Received: by 2002:a7b:ce91:: with SMTP id q17mr3333329wmj.28.1615980244483; Wed, 17 Mar 2021 04:24:04 -0700 (PDT) Received: from localhost (host86-134-238-232.range86-134.btcentralplus.com. [86.134.238.232]) by smtp.gmail.com with ESMTPSA id w6sm26611241wrl.49.2021.03.17.04.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 04:24:04 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 1/5] gdb/testsuite: remove duplicate test names for gdb.cp/nsusing.exp Date: Wed, 17 Mar 2021 11:23:57 +0000 Message-Id: <34f359123b808d0320b173dceae70799ee4b9fd6.1615980148.git.andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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, 17 Mar 2021 11:24:07 -0000 In trying to resolve the duplicate test names for the gdb.cp/nsusing.exp script, I ended up giving the test script a serious spring clean. This reverts some of the changes introduced in commit df83a9bf8b0d, but I don't think that we have lost any testing. The test program is made of many functions, the test script wants to stop in different functions and check which symbols are in scope. Previously the test script would either restart GDB completely in order to "progress" to the next function, or the script would restart the test program using 'runto'. In this commit I have reordered the steps of the test to correspond to program order, I then progress through the test program once by just placing a breakpoint and then continuing. As I said, the test is checking which symbols are in scope at each location, so the exact order of the tests doesn't matter, so long as we check the correct symbols at each location. I have also given the comments capital letters and full stops, and re-wrapped them to a more sensible line length. There was a duplicate test block introduced in the df83a9bf8b0d commit which I have removed in this commit, this duplicate code was responsible for one of the duplicate test names. The other duplicate test name was due to the same command being run at different locations, in this case I just gave the two tests explicit, unique, names. gdb/testsuite/ChangeLog: * gdb.cp/nsusing.exp: Rewrite test, remove a duplicate test block. Avoid repeated uses of 'runto', and instread just progress once through the test stopping at different breakpoints. Give comments a capital letter and full stop. Give duplicate tests unique names. --- gdb/testsuite/ChangeLog | 7 ++ gdb/testsuite/gdb.cp/nsusing.exp | 133 ++++++++----------------------- 2 files changed, 40 insertions(+), 100 deletions(-) diff --git a/gdb/testsuite/gdb.cp/nsusing.exp b/gdb/testsuite/gdb.cp/nsusing.exp index ce906b096e8..8020eb03f45 100644 --- a/gdb/testsuite/gdb.cp/nsusing.exp +++ b/gdb/testsuite/gdb.cp/nsusing.exp @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - standard_testfile .cc if [get_compiler_info] { @@ -25,8 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { } ############################################ -# test printing of namespace imported within -# the function. +# Test printing of namespace imported within the function. if ![runto_main] then { perror "couldn't run to breakpoint main" @@ -35,69 +33,19 @@ if ![runto_main] then { gdb_test "print _a" "= 1" -# Test that names are not printed when they -# are not imported - -gdb_breakpoint marker3 -gdb_continue_to_breakpoint "marker3" - -#send_gdb "break marker3\n" -#send_gdb "continue\n" - -gdb_test "print _a" "No symbol \"_a\" in current context." \ - "Print _a without import" - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - - ############################################ -# test printing of namespace imported into -# a scope containing the pc. - -if ![runto_main] then { - perror "couldn't run to breakpoint main" - continue -} +# Test printing of namespace imported into a scope containing the pc. gdb_breakpoint [gdb_get_line_number "marker1 stop"] gdb_continue_to_breakpoint "marker1 stop" gdb_test "print _a" "= 1" "print _a in a nested scope" - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - ############################################ -# test printing of namespace imported into -# file scope. +# Test printing of namespace aliases. - -if ![runto marker5] then { - perror "couldn't run to breakpoint marker5" - continue -} - -gdb_test "print cc" "= 3" - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - - -############################################ -# Test printing of namespace aliases - -if ![runto marker2] then { - perror "couldn't run to breakpoint marker2" - continue -} +gdb_breakpoint marker2 +gdb_continue_to_breakpoint "marker2" gdb_test "print B::_a" "= 1" @@ -107,19 +55,12 @@ gdb_test "print _a" "No symbol \"_a\" in current context." \ gdb_test "print x" "No symbol \"x\" in current context." \ "print x in namespace alias scope" -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - - ############################################ # Test that names are not printed when they -# are not imported +# are not imported. -if {![runto marker3]} { - perror "couldn't run to breakpoint marker3" -} +gdb_breakpoint marker3 +gdb_continue_to_breakpoint "marker3" # gcc-4-3 puts import statements for aliases in # the global scope instead of the corresponding @@ -128,70 +69,62 @@ if {![runto marker3]} { if [test_compiler_info gcc-4-3-*] then { setup_xfail *-*-* } gdb_test "print _a" "No symbol \"_a\" in current context." \ - "Print _a without import" + "Print _a without import at marker3" ############################################ -# Test printing of individually imported elements +# Test printing of individually imported elements. -if ![runto marker4] then { - perror "couldn't run to breakpoint marker4" - continue -} +gdb_breakpoint marker4 +gdb_continue_to_breakpoint "marker4" gdb_test "print dx" "= 4" ############################################ -# Test printing of namespace aliases +# Test printing of namespace imported into file scope. -if ![runto marker5] then { - perror "couldn't run to marker5" - continue -} +gdb_breakpoint marker5 +gdb_continue_to_breakpoint "marker5" + +gdb_test "print cc" "= 3" + +# Also test printing of namespace aliases gdb_test "print efx" "= 5" ############################################ -# Test printing of variables imported from -# nested namespaces +# Test printing of variables imported from nested namespaces. -if ![runto I::marker7] then { - perror "couldn't run to breakpoint I::marker7" - continue -} +gdb_breakpoint I::marker7 +gdb_continue_to_breakpoint "I::marker7" gdb_test "print ghx" "= 6" ############################################ -# Test that variables are not printed in a namespace -# that is sibling to the namespace containing an import +# Test that variables are not printed in a namespace that is sibling +# to the namespace containing an import. -if ![runto L::marker8] then { - perror "couldn't run to breakpoint L::marker8" - continue -} +gdb_breakpoint L::marker8 +gdb_continue_to_breakpoint "L::marker8" -gdb_test "print jx" "= 44" +gdb_test "print jx" "= 44" \ + "print jx when the symbol is available" gdb_breakpoint "K::marker9" gdb_continue_to_breakpoint "K::marker9" -gdb_test "print jx" "No symbol \"jx\" in current context." +gdb_test "print jx" "No symbol \"jx\" in current context." \ + "print jx when the symbol is not available" ############################################ -# Test that variables are only printed after the line -# containing the import - -if ![runto_main] then { - perror "couldn't run to breakpoint main" - continue -} +# Test that variables are only printed after the line containing the +# import. gdb_breakpoint [gdb_get_line_number "marker10 stop"] gdb_continue_to_breakpoint "marker10 stop" if { [test_compiler_info {gcc-[0-3]-*}] || [test_compiler_info {gcc-4-[0-3]-*}]} { - setup_xfail *-*-* + setup_xfail *-*-* } # Assert that M::x is printed and not N::x -- 2.25.4