From patchwork Thu Feb 1 10:49:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 85124 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 642FD3857022 for ; Thu, 1 Feb 2024 10:50:21 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 966C53858D33 for ; Thu, 1 Feb 2024 10:49:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 966C53858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 966C53858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706784594; cv=none; b=wwklCI19sh8SkmRRYNqxVzD34CeEUIKGKD4oGn7aNgTVh4da8l2ZBPaJsq7dEzNsZQFiSh+qIaOMxu+/46Jhl/2b9MIffKkXg6uP/4u06fC+FKC+fooQ6y7Lk3mDsqCIgCJEVF2Jhr33pDOiQiN+5CNSpIK4BpEl88rChaNHTMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706784594; c=relaxed/simple; bh=Ud3118tpau79HM8ed7db7U7xtazhLG6S6tfGcvX3jb8=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=v7E93pBWgSMnzQKmSPsKZXGCgtSYtDb6AK6LkAgXR24iakjNdGOZ1hNZGIqHRG+uI9t1O8QK36pjvZkAr4eXBytEmyn2ZJ1y+ZCtyBBzpPi3ym4e7sw0LAPXEaeFED7U82+YKD4bpmrfno4RKWyL4X/O0BlOEKU3nTz5sKKx+Ss= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706784592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5NdBl494TQ4a0aeX+OkAa52bX/iiu4upiI0eqSUBieU=; b=iANbJT2rawiWD20JbLg+C1U5YiZchj818KCDAnQSKrketvoNU9fHWUCOcvuOw3NkCpecrr aJRa+VaAH4N0TTff/vkCB8I5eYIOqWtDTY+EVv649LEfsqD4Q1QKdizVsF7YwQNlZWxDLJ 4Ci5phnz1hJ+iiLj1lYRND51WTT7uqo= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-27-RWLsN71yM_aW2Jbys5UUYg-1; Thu, 01 Feb 2024 05:49:51 -0500 X-MC-Unique: RWLsN71yM_aW2Jbys5UUYg-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-5101e826a3dso631249e87.3 for ; Thu, 01 Feb 2024 02:49:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706784589; x=1707389389; 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=5NdBl494TQ4a0aeX+OkAa52bX/iiu4upiI0eqSUBieU=; b=A2bOPY+1yRpmb2XDRq5qoCuqABTLe0APtapglZ8GSrIpF9SeU+hP0bTUFB21IiMg2h mGahmapiPREoxD9e/lkHqp2mw4Eup+BNRZKpuOoQEx5srNcXOByP2vBz0MDxT/6y50/4 nUrPdjVxj/BN8YESw/JnuZDdU2bDpID2s70oPEmS8EAbdxMY7dCLzUvglPjI/bEtGkPv 93uV81iIBEBw36vbBY+cwrPU1nz/YnttJT/BCRcjJ2aqu4h5PWqHWKnhRb3YryN+tnPn sluQ4EDWNRvpBpTTXupyENd7esZ9HprHrD7W9FsS279w1rmGfXW35BVNBZB78Rftbs6P 3p1w== X-Gm-Message-State: AOJu0YyTZeDCWidXJonBGC6mcCbJc+8/EarTCamgXBnXBOdblI2m3JGc OahoyPSxkO2ZwyPcFi6aJg+mpf8aSDEekB5TcBq5JMWKlp+CLzxnflnEeaqUfTW51xgkfa315aH oSXf6jZUXPp2bc3uu9KbOQJXjw9kELilI+BG50oF4HWnNIXXeDO7wduRRHD5geEZQlViC+ua+vg zqCScss9AU2MRc89ApfHIhjpCsoiWQfWeCO+SKh4rJyvw= X-Received: by 2002:a05:6512:1113:b0:511:2e97:add2 with SMTP id l19-20020a056512111300b005112e97add2mr1368722lfg.66.1706784588884; Thu, 01 Feb 2024 02:49:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IFDrFJ8VmecZeE0sNlBpIYeRaXaUdhBaPEbv4U5wFMa1z+XAmvKCjyy92APdz0Hkf9OpVhEkw== X-Received: by 2002:a05:6512:1113:b0:511:2e97:add2 with SMTP id l19-20020a056512111300b005112e97add2mr1368680lfg.66.1706784588369; Thu, 01 Feb 2024 02:49:48 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id hn32-20020a05600ca3a000b0040d91fa270fsm3980860wmb.36.2024.02.01.02.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 02:49:48 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PUSHED] gdb/testsuite: fix some duplicate test names in gdb.trace/ Date: Thu, 1 Feb 2024 10:49:45 +0000 Message-Id: <05d1b4b4ad7d74a64cc71c53d621241fc393fcb6.1706784559.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, 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 This commit fixes some of the easier duplicate test names in the gdb.trace/ directory. All of these duplicates are resolved by either given tests a name, or by extended the existing name to make it more descriptive. There should be no change in what is tested after this commit. --- gdb/testsuite/gdb.trace/mi-tsv-changed.exp | 4 ++-- gdb/testsuite/gdb.trace/status-stop.exp | 12 ++++++++---- gdb/testsuite/gdb.trace/trace-buffer-size.exp | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) base-commit: 025f70c8614ecd7293940dcf03b2691adf586031 diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp index 09c32609ba3..50d325aae82 100644 --- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp @@ -83,7 +83,7 @@ proc test_create_delete_modify_tsv { } { mi_gdb_test "tvariable \$tvar3 = 3" \ ".*=tsv-created,name=\"tvar3\",initial=\"3\".*\\^done" \ - "tvariable \$tvar3 modified" + "tvariable \$tvar3 modified to 3" mi_gdb_test "-break-insert -a gdb_c_test" \ {.*\^done,bkpt=.*} \ "insert tracepoint on gdb_c_test" @@ -122,7 +122,7 @@ proc test_create_delete_modify_tsv { } { mi_gdb_test "-trace-list-variables" ".*" "list trace variables" mi_gdb_test "tvariable \$tvar3 = 2" \ ".*=tsv-modified,name=\"tvar3\",initial=\"2\",current=\"6\".*\\^done" \ - "tvariable \$tvar3 modified" + "tvariable \$tvar3 modified to 2" } } diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp index e133039cf7b..a980b692d1f 100644 --- a/gdb/testsuite/gdb.trace/status-stop.exp +++ b/gdb/testsuite/gdb.trace/status-stop.exp @@ -47,7 +47,8 @@ proc test_tstart_tstop_tstart { } { } gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*" - gdb_test_no_output "tstart" + gdb_test_no_output "tstart" \ + "first tstart" gdb_breakpoint "end" qualified gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \ @@ -55,7 +56,8 @@ proc test_tstart_tstop_tstart { } { gdb_test_no_output "tstop" - gdb_test_no_output "tstart" + gdb_test_no_output "tstart" \ + "second tstart" } } @@ -103,12 +105,14 @@ proc test_buffer_full_tstart { } { "" \ "collect buf" "^$" - gdb_test_no_output "tstart" + gdb_test_no_output "tstart" \ + "first tstart" gdb_breakpoint "end" qualified gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end" gdb_test "tstatus" ".*buffer was full.*" - gdb_test_no_output "tstart" + gdb_test_no_output "tstart" \ + "second tstart" } } diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp index 1e447d4d7ab..880ffc6d4cc 100644 --- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp +++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp @@ -88,7 +88,8 @@ gdb_test "trace test_function" \ "set tracepoint at test_function" gdb_trace_setactions "Set action for trace point 1" "" \ "collect var" "^$" -gdb_test_no_output "tstart" +gdb_test_no_output "tstart" \ + "tstart with very small trace buffer" gdb_test "continue" \ "Continuing.*Breakpoint $decimal.*" \ "run trace experiment 1" @@ -103,10 +104,11 @@ runto_main gdb_breakpoint ${srcfile}:[gdb_get_line_number "breakpoint1"] gdb_test "trace test_function" \ "Tracepoint \[0-9\]+ at .*" \ - "set tracepoint at test_function" + "set tracepoint at test_function again" gdb_trace_setactions "Set action for trace point 2" "" \ "collect var" "^$" -gdb_test_no_output "tstart" +gdb_test_no_output "tstart" \ + "tstart with default trace buffer size" gdb_test "continue" \ "Continuing.*Breakpoint $decimal.*" \ "run trace experiment 2"