From patchwork Fri Jan 19 19:07:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 84458 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 869953858403 for ; Fri, 19 Jan 2024 19:08:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id 32B7D3858C56 for ; Fri, 19 Jan 2024 19:08:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32B7D3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 32B7D3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d29 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705691282; cv=none; b=v3DdooG8iqXwL+1NpzwLG3TteZbwdzUAOnk6ZZye+o0C3r2tdv/7siyOBzk3LTnVwiHGNXfySmRF/R2ec3ycwSwgjTXc+iiz+LzF6p6XIWHAlIZDYU0A49LfQnL1Ud2RCorkx5JOdbKYcVFPlyEFfE1J8juQ6xVLz3cAs2CO2vE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705691282; c=relaxed/simple; bh=3CtvTWjDBzXcXyh4CaKdkpLXYnraaGNbGMzicCHgM/I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=L0NwuHLdCBhlBbnZ/8JFiwM0ufDBrG8kX9wI1VdwiZF0FMkqOcVZMzwKF6OtGGTB5EI6el5FWqHfdP9/SBKhVDMHC25vcVpaIeE7c+RaPslgswF82M/dViDDjbZuNWtDSgCfEVHLY94cekmqrio1mt0aCvdynXxJZlIXNlMGW3I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7bc32b0fdadso48120839f.2 for ; Fri, 19 Jan 2024 11:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1705691280; x=1706296080; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vDYEhRvffMOtaRGnxq1RNjEcZawbQwbAwXEqoyeQ7wI=; b=SpXjdMuwHa9D7jlX5ZvyfY39v96bxvyNVLhZNAuxx9KLJLo8xQjKmZ4U8dDVQtZb/J jbFOGidwPOH5GSCtuRgox744S44foXO/wVY5oijt+WqTnJE+TdEknCXw21LJH9KfxUn6 RVuGzRgzPi2mIBgC2TwLlIs3QHTRwDqxeo9iVcolxu8bwa0EBWOSMRGZCVtl2xljXaOg FyYwEf574Gro8iL3jIojxMcugU0YtAMZhshfap+aAckHYl1wr0at93HmiHSqhhDpQH4m 1idhF+FRKw9CxGEGuhKH1oX1il59bbslZl2fJAaMvdsVccVBsJE3+tifplXm1HAzhEpc gdOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705691280; x=1706296080; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vDYEhRvffMOtaRGnxq1RNjEcZawbQwbAwXEqoyeQ7wI=; b=pp2BH3yQESh8JhkQxwvSwRZe9GiiWkzhV/rERd2OjnXngCMWXGXNMpwavc7XjyDuqH 7mzs0omCTBQyBJa8+0KIitqctNooABQ0d16KhTSw4PdfwFayB0Pih7wzjfyaC90Z2gME tRX893T8SEuA0yQfW1gnrBhG4Pkibml3htqjvMhph9S2hog4/XxsgjajsHdwX7tykJdW Jzwcs45NF2fBpluKGVxlSDC6BL/kBNWTU2QB7pg6rOm2ENBWEs1MdZAP1YZEvG0gsrNL pu+fAmgAaT6353oQkhL+WqcP2SF91sUIORv3QhEHxBpsYnC4GxQCvShKSSY9UdZ0wMTG +UJQ== X-Gm-Message-State: AOJu0Yzx1tD5kV3H2sLIOrutrhzzwSVXIuGf8Q2fmF1ZNLydPmEFk18X yXvvwtFXGygby7wD5PI0jKgr8fs+CDllnY+WGjoMoXzb8opadhV9BXWRHXE+oq+HROoFxzp0itA = X-Google-Smtp-Source: AGHT+IFaQzVFl9wbKLPT6xG/A7fVVUCMdBAMhUDugSDoZFZJKQmEVjmfjM2p7/7Rzu2IHYD7lJWNPQ== X-Received: by 2002:a05:6602:17d9:b0:7be:ce5f:9db2 with SMTP id z25-20020a05660217d900b007bece5f9db2mr201398iox.17.1705691280392; Fri, 19 Jan 2024 11:08:00 -0800 (PST) Received: from localhost.localdomain (97-122-68-157.hlrn.qwest.net. [97.122.68.157]) by smtp.gmail.com with ESMTPSA id c11-20020a02a60b000000b0046e4e92e0aesm1732444jam.174.2024.01.19.11.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 11:07:59 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Avoid duplicate test in dw2-zero-range.exp Date: Fri, 19 Jan 2024 12:07:52 -0700 Message-ID: <20240119190752.4075435-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I noticed that dw2-zero-range.exp reports a duplicate test name. This happens because have_index calls get_index_type with the default test name. This patch fixes the problem using with_test_prefix. --- gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp index 79ccd620b8b..265c1fd3651 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp @@ -122,7 +122,7 @@ foreach_with_prefix ranges_sect {ranges rnglists} { # Test for presence of complaint, with lib1 relocated. with_complaints 1 { - set test "Zero address complaint - relocated - psymtab" + set test "Zero address - relocated - psymtab" set have_complaint 0 gdb_test_multiple "maint with dwarf synchronous on -- sharedlibrary [file tail $lib1]" $test { -re -wrap $re { @@ -133,8 +133,10 @@ foreach_with_prefix ranges_sect {ranges rnglists} { } # The complaint won't be seen if an index is in use. - if {[have_index $lib1] == ""} { - gdb_assert { $have_complaint } $test + with_test_prefix $test { + if {[have_index $lib1] == ""} { + gdb_assert { $have_complaint } "complaint" + } } } @@ -150,11 +152,13 @@ foreach_with_prefix ranges_sect {ranges rnglists} { gdb_test_no_output "maint set dwarf synchronous on" with_complaints 1 { gdb_load $lib1 - set test "Zero address complaint - unrelocated - psymtab" + set test "Zero address - unrelocated - psymtab" set have_complaint [regexp $re.* $gdb_file_cmd_msg] # The complaint won't be seen if an index is in use. - if {[have_index $lib1] == ""} { - gdb_assert { $have_complaint } $test + with_test_prefix $test { + if {[have_index $lib1] == ""} { + gdb_assert { $have_complaint } "complaint" + } } } gdb_test_no_output "maint set dwarf synchronous off"