From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 7647D3858D20 for ; Tue, 15 Mar 2022 17:01:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7647D3858D20 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-542-cBzuHQ1UNaO43IDXzHAOhA-1; Tue, 15 Mar 2022 13:01:29 -0400 X-MC-Unique: cBzuHQ1UNaO43IDXzHAOhA-1 Received: by mail-wm1-f70.google.com with SMTP id v184-20020a1cacc1000000b0038a12dbc23bso1471792wme.5 for ; Tue, 15 Mar 2022 10:01:29 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7p/RIaaOG433zuV9S5lUzVCDPQc53fonAYQYKdIjMuk=; b=18ictpfB4caK9X63PEN9C4gqNuLIMxz0Kght5KDECSDygnhIy6nsL3hXytAEbvFQHq 3hdR/O09uN62DW6OX9kRXb/OC+MEcawmOJ6K8gvtpCKEerF8czjqWPxuraUOirfzeESs JGavy9ff+Hg+2tQXEpjCxfpn/XZ/USKSORWSdUI32JHuB0lY4veJHM6CF1lxW3hJ6egg 41HhiaT5ktDeyPdj4g4pebfziFEHemIDhqlDNmyBTYKQSUSCCDR23YsqoCnqlQVNLFk+ pOnchWpFikJkczG8AwLvjR9mzjwCJsnIXzAisrsbH5HeAYA+x9b0QD3l9L2PpzU0UQIw Hiuw== X-Gm-Message-State: AOAM532CYiTauUHrMespnsRsO6Tlrmu5X+0a/u6A4dpMsUoW6FLWanGs BB0Dv0lwrCTOAzOUGcVsZzdXW6FmScQ5NdfVq0IimxpCTIr8VYa/iT2rS/qaYIGNfTS4Uca8XRq 3ipOzWVglf+Tvhj3p/fMSiNFlUbA8hwhdXRJaVUasE06nrtVYT4wzxZMl0aw6SjBAKWDZKG3s1A == X-Received: by 2002:a5d:6712:0:b0:1f0:2486:2fff with SMTP id o18-20020a5d6712000000b001f024862fffmr20943696wru.200.1647363688268; Tue, 15 Mar 2022 10:01:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAOQd0RhgxkfDAUbDXp8UaDCB5k04S/iQZ6LiJge+Ipq5pVdxhwNg1TBeN30KN/BXZvf8HhA== X-Received: by 2002:a5d:6712:0:b0:1f0:2486:2fff with SMTP id o18-20020a5d6712000000b001f024862fffmr20943663wru.200.1647363687838; Tue, 15 Mar 2022 10:01:27 -0700 (PDT) Received: from localhost (host109-154-72-186.range109-154.btcentralplus.com. [109.154.72.186]) by smtp.gmail.com with ESMTPSA id k10-20020adfe3ca000000b001f0329ba94csm25156596wrm.18.2022.03.15.10.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 10:01:27 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PUSHED] gdb/testsuite: rename a proc and fix a typo Date: Tue, 15 Mar 2022 17:01:25 +0000 Message-Id: <20220315170125.3449436-1-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-12.3 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: Tue, 15 Mar 2022 17:01:34 -0000 Rename a proc in gdb.mi/user-selected-context-sync.exp, I think the old name was most likely a typo. The old name match_re_or_ensure_not_output seems (to me) to imply we're in some way checking that the regexp was not output. But that's not what we are doing, we're checking either for the regexp, or for no output, hence the new name match_re_or_ensure_no_output. Additionally, I found a definite typo in one of the comments that I've also fixed. I also updated some test names. These tests (probably due to copy & paste errors) has 'on MI' on their name, when they were actually checking CLI output. For these test I changed the name to use 'on CLI'. There should be no change in what is tested after this commit. --- .../gdb.mi/user-selected-context-sync.exp | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index e60d33a6d4c..3b4ff0bf2e4 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -511,7 +511,7 @@ proc ensure_no_output { test } { # current spawn_id) and pass/fail TEST accordingly. # If RE is empty, ensure that the program did not output anything. -proc match_re_or_ensure_not_output { re test } { +proc match_re_or_ensure_no_output { re test } { if { $re != "" } { gdb_expect { -re "$re" { @@ -545,7 +545,7 @@ proc_with_prefix test_cli_inferior { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "event on MI" + match_re_or_ensure_no_output $mi_re "event on MI" } # Do the 'inferior' command on the currently selected inferior. For now, @@ -555,7 +555,7 @@ proc_with_prefix test_cli_inferior { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "event on MI again" + match_re_or_ensure_no_output $mi_re "event on MI again" } } @@ -581,7 +581,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select thread, event on MI " + match_re_or_ensure_no_output $mi_re "select thread, event on MI " } # Do the 'thread' command to select the same thread. We shouldn't receive @@ -594,7 +594,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select thread, event on MI again" + match_re_or_ensure_no_output $mi_re "select thread, event on MI again" } # Try the 'thread' command without arguments. @@ -607,7 +607,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "thread without args, event on MI" + match_re_or_ensure_no_output $mi_re "thread without args, event on MI" } } @@ -628,7 +628,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select thread, event on MI" + match_re_or_ensure_no_output $mi_re "select thread, event on MI" } # Do the 'thread' command to select the third thread again. Again, we @@ -641,7 +641,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select thread again, event on MI" + match_re_or_ensure_no_output $mi_re "select thread again, event on MI" } # Try the 'thread' command without arguments. @@ -654,7 +654,7 @@ proc_with_prefix test_cli_thread { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "thread without args, event on MI" + match_re_or_ensure_no_output $mi_re "thread without args, event on MI" } } @@ -682,7 +682,7 @@ proc_with_prefix test_cli_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1, event on MI" } # Do the 'frame' command to select the same frame. This time we don't @@ -695,7 +695,7 @@ proc_with_prefix test_cli_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1 again, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1 again, event on MI" } # Do the 'frame' command without arguments. We shouldn't see anything on MI. @@ -705,7 +705,7 @@ proc_with_prefix test_cli_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "frame without args, event on MI" + match_re_or_ensure_no_output $mi_re "frame without args, event on MI" } } @@ -728,7 +728,7 @@ proc_with_prefix test_cli_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1, event on MI" } # Do the 'frame' command without arguments. @@ -743,7 +743,7 @@ proc_with_prefix test_cli_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "frame without args, event on MI" + match_re_or_ensure_no_output $mi_re "frame without args, event on MI" } } } @@ -766,7 +766,7 @@ proc_with_prefix test_cli_select_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1, event on MI" } # Do the 'select-frame' command to select the same frame. This time we expect to @@ -779,7 +779,7 @@ proc_with_prefix test_cli_select_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1 again, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1 again, event on MI" } } @@ -805,7 +805,7 @@ proc_with_prefix test_cli_select_frame { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "select frame 1, event on MI" + match_re_or_ensure_no_output $mi_re "select frame 1, event on MI" } } } @@ -828,7 +828,7 @@ proc_with_prefix test_cli_up_down { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "frame up, event on MI" + match_re_or_ensure_no_output $mi_re "frame up, event on MI" } # Try doing a 'down'. @@ -841,7 +841,7 @@ proc_with_prefix test_cli_up_down { mode } { } with_spawn_id $mi_spawn_id { - match_re_or_ensure_not_output $mi_re "frame down, event on MI" + match_re_or_ensure_no_output $mi_re "frame down, event on MI" } } @@ -864,7 +864,7 @@ proc_with_prefix test_mi_thread_select { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "-thread-select, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "-thread-select, event on CLI" } # Do the '-thread-select' command to select the same thread. We @@ -878,7 +878,7 @@ proc_with_prefix test_mi_thread_select { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "-thread-select again, event on CLI" + match_re_or_ensure_no_output $cli_re "-thread-select again, event on CLI" } } @@ -899,7 +899,7 @@ proc_with_prefix test_mi_thread_select { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "-thread-select, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "-thread-select, event on CLI" } # Do the 'thread' command to select the third thread again. Again, we @@ -912,13 +912,13 @@ proc_with_prefix test_mi_thread_select { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "-thread-select again, event on CLI" + match_re_or_ensure_no_output $cli_re "-thread-select again, event on CLI" } } with_test_prefix "thread 1.2 with --thread" { # Test selecting a thread from MI with a --thread option. This test - # verifies that even if the thread GDB would switch to is the same has + # verifies that even if the thread GDB would switch to is the same as # the thread specified with --thread, an event is still sent to CLI. # In this case this is thread 1.2 @@ -932,7 +932,7 @@ proc_with_prefix test_mi_thread_select { mode } { with_spawn_id $gdb_main_spawn_id { # This doesn't work as of now, no event is sent on CLI. It is # commented out so we don't have to wait for the timeout every time. - # match_re_or_ensure_not_output "$cli_re\r\n" "-thread-select, event on cli" + # match_re_or_ensure_no_output "$cli_re\r\n" "-thread-select, event on cli" kfail "gdb/20631" "thread-select, event on cli" } } @@ -959,7 +959,7 @@ proc_with_prefix test_mi_stack_select_frame { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "-stack-select-frame, event on MI" + match_re_or_ensure_no_output "$cli_re\r\n" "-stack-select-frame, event on CLI" } # Do the '-stack-select-frame' command to select the same frame. This time we don't @@ -972,7 +972,7 @@ proc_with_prefix test_mi_stack_select_frame { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "-stack-select-frame again, event on MI" + match_re_or_ensure_no_output $cli_re "-stack-select-frame again, event on CLI" } } @@ -996,7 +996,7 @@ proc_with_prefix test_mi_stack_select_frame { mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "-stack-select-frame, event on MI" + match_re_or_ensure_no_output $cli_re "-stack-select-frame, event on CLI" } } } @@ -1029,7 +1029,7 @@ proc_with_prefix test_cli_in_mi_inferior { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "select inferior, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "select inferior, event on CLI" } # Do the 'inferior' command on the currently selected inferior. For now, @@ -1039,7 +1039,7 @@ proc_with_prefix test_cli_in_mi_inferior { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "select inferior again, event on CLI" + match_re_or_ensure_no_output $cli_re "select inferior again, event on CLI" } } @@ -1063,7 +1063,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "select thread, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "select thread, event on CLI" } # Do the 'thread' command to select the same thread. We shouldn't @@ -1077,7 +1077,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "select thread again, event on CLI" + match_re_or_ensure_no_output $cli_re "select thread again, event on CLI" } # Try the 'thread' command without arguments. @@ -1092,7 +1092,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "thread without args, event on CLI" + match_re_or_ensure_no_output $cli_re "thread without args, event on CLI" } } @@ -1114,7 +1114,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "select thread, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "select thread, event on CLI" } # Do the 'thread' command to select the third thread again. Again, we @@ -1132,7 +1132,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "select thread again, event on CLI" + match_re_or_ensure_no_output $cli_re "select thread again, event on CLI" } # Try the 'thread' command without arguments. @@ -1147,7 +1147,7 @@ proc_with_prefix test_cli_in_mi_thread { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "thread without args, event on CLI" + match_re_or_ensure_no_output $cli_re "thread without args, event on CLI" } } @@ -1176,7 +1176,7 @@ proc_with_prefix test_cli_in_mi_frame { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output "$cli_re\r\n" "select frame 1, event on CLI" + match_re_or_ensure_no_output "$cli_re\r\n" "select frame 1, event on CLI" } # Do the 'frame' command to select the same frame. This time we don't @@ -1190,7 +1190,7 @@ proc_with_prefix test_cli_in_mi_frame { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "select frame 1 again, event on CLI" + match_re_or_ensure_no_output $cli_re "select frame 1 again, event on CLI" } # Do the 'frame' command without arguments. We shouldn't see anything on MI. @@ -1203,7 +1203,7 @@ proc_with_prefix test_cli_in_mi_frame { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "frame without args, event on CLI" + match_re_or_ensure_no_output $cli_re "frame without args, event on CLI" } } @@ -1228,7 +1228,7 @@ proc_with_prefix test_cli_in_mi_frame { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "select frame 1, event on CLI" + match_re_or_ensure_no_output $cli_re "select frame 1, event on CLI" } # Do the 'frame' command without arguments. @@ -1246,7 +1246,7 @@ proc_with_prefix test_cli_in_mi_frame { mode cli_in_mi_mode } { } with_spawn_id $gdb_main_spawn_id { - match_re_or_ensure_not_output $cli_re "frame without args, event on CLI" + match_re_or_ensure_no_output $cli_re "frame without args, event on CLI" } } } -- 2.25.4