public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Lancelot SIX <lsix@lancelotsix.com>
To: gdb-patches@sourceware.org
Cc: Lancelot SIX <lsix@lancelotsix.com>
Subject: [PATCH 11/12] gdb/testsuite: Remove duplicates from gdb.mi/mi2-amd64-entry-value.exp
Date: Fri, 26 Nov 2021 23:00:37 +0000	[thread overview]
Message-ID: <20211126230038.103225-12-lsix@lancelotsix.com> (raw)
In-Reply-To: <20211126230038.103225-1-lsix@lancelotsix.com>

When running the testsuite, I have:

    Running .../gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp ...
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: breakpoint at main
    DUPLICATE: gdb.mi/mi2-amd64-entry-value.exp: mi runto main

Fix by enclosing the various 'mi_runto_main' calls (which are
responsible for the DUPLICATEs warnings) in 'with_test_prefix' blocks
since this is the easiest way to adjust the test names.

Tested on x86_64-linux.
---
 .../gdb.mi/mi2-amd64-entry-value.exp          | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
index 4505bfada67..eae9a9c17ad 100644
--- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
@@ -49,8 +49,10 @@ foreach name {different breakhere_different breakhere_validity breakhere_invalid
 
 # Test various kinds of `set print entry-values'.
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values no" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values no" {\^done} "no: set print entry-values"
 mi_send_resuming_command "exec-continue" "no: entry_equal: continue"
@@ -66,8 +68,10 @@ mi_send_resuming_command "exec-continue" "no: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv",value="<optimized out>"}} .* .* {.* disp="keep"} "no: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv",arg="1",value="<optimized out>"}\]} "no: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values only" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values only" {\^done} "only: set print entry-values"
 mi_send_resuming_command "exec-continue" "only: entry_equal: continue"
@@ -83,8 +87,10 @@ mi_send_resuming_command "exec-continue" "only: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv@entry",value="<optimized out>"}} .* .* {.* disp="keep"} "only: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv@entry",arg="1",value="<optimized out>"}\]} "only: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values preferred" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values preferred" {\^done} "preferred: set print entry-values"
 mi_send_resuming_command "exec-continue" "preferred: entry_equal: continue"
@@ -100,8 +106,10 @@ mi_send_resuming_command "exec-continue" "preferred: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv@entry",value="<optimized out>"}} .* .* {.* disp="keep"} "preferred: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv@entry",arg="1",value="<optimized out>"}\]} "preferred: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values if-needed" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values if-needed" {\^done} "if-needed: set print entry-values"
 mi_send_resuming_command "exec-continue" "if-needed: entry_equal: continue"
@@ -117,8 +125,10 @@ mi_send_resuming_command "exec-continue" "if-needed: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv",value="<optimized out>"}} .* .* {.* disp="keep"} "if-needed: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv",arg="1",value="<optimized out>"}\]} "if-needed: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values both" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values both" {\^done} "both: set print entry-values"
 mi_send_resuming_command "exec-continue" "both: entry_equal: continue"
@@ -134,8 +144,10 @@ mi_send_resuming_command "exec-continue" "both: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv",value="<optimized out>"},{name="inv@entry",value="<optimized out>"}} .* .* {.* disp="keep"} "both: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv",arg="1",value="<optimized out>"},{name="inv@entry",arg="1",value="<optimized out>"}\]} "both: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values compact" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values compact" {\^done} "compact: set print entry-values"
 mi_send_resuming_command "exec-continue" "compact: entry_equal: continue"
@@ -151,8 +163,10 @@ mi_send_resuming_command "exec-continue" "compact: invalid: continue"
 mi_expect_stop "breakpoint-hit" .* {{name="inv",value="<optimized out>"}} .* .* {.* disp="keep"} "compact: invalid: stop"
 mi_gdb_test "-stack-list-variables --all-values" {\^done,variables=\[{name="inv",arg="1",value="<optimized out>"}\]} "compact: invalid: -stack-list-variables"
 
-if {[mi_runto_main] == -1} {
-    return -1
+with_test_prefix "setup for set print-entry-values default" {
+    if {[mi_runto_main] == -1} {
+	return -1
+    }
 }
 mi_gdb_test "-gdb-set print entry-values default" {\^done} "default: set print entry-values"
 mi_send_resuming_command "exec-continue" "default: entry_equal: continue"
-- 
2.33.1


  parent reply	other threads:[~2021-11-26 23:01 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-26 23:00 [PATCH 00/12] Remove DUPLICATEs warnings Lancelot SIX
2021-11-26 23:00 ` [PATCH 01/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-syn-frame.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 02/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nsthrexec.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 03/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-watch.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 04/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-catch-load.exp Lancelot SIX
2021-12-10 21:55   ` Pedro Alves
2021-12-16 23:27     ` Lancelot SIX
2021-12-17 12:21       ` Pedro Alves
2021-11-26 23:00 ` [PATCH 05/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-var-child.exp Lancelot SIX
2021-12-10 21:55   ` Pedro Alves
2021-12-16 23:40     ` Lancelot SIX
2021-12-17 13:00       ` [PATCH] gdb/testsuite: Remove some duplication " Pedro Alves
2021-12-17 23:24         ` Lancelot SIX
2022-01-06 16:44           ` Pedro Alves
2021-11-26 23:00 ` [PATCH 06/12] gdb/testsuite: Remove duplicates from gdb.mi/mi2-var-child.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 07/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 08/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop-exit.exp Lancelot SIX
2021-12-10 21:56   ` Pedro Alves
2021-12-16 23:48     ` Lancelot SIX
2021-12-17 13:52       ` Pedro Alves
2021-11-26 23:00 ` [PATCH 09/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-var-rtti.exp Lancelot SIX
2021-11-26 23:00 ` [PATCH 10/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-language.exp Lancelot SIX
2021-12-10 21:56   ` Pedro Alves
2021-12-16 23:59     ` Lancelot SIX
2021-12-17 13:53       ` Pedro Alves
2021-11-26 23:00 ` Lancelot SIX [this message]
2021-12-10 21:56   ` [PATCH 11/12] gdb/testsuite: Remove duplicates from gdb.mi/mi2-amd64-entry-value.exp Pedro Alves
2021-12-17 22:57     ` Lancelot SIX
2022-01-06 16:49       ` Pedro Alves
2021-11-26 23:00 ` [PATCH 12/12] gdb/testsuite: Remove duplicates from gdb.threads/staticthreads.ex Lancelot SIX
2021-12-09 18:15 ` [PATCH 00/12] Remove DUPLICATEs warnings Tom Tromey
2021-12-10 22:01 ` Pedro Alves
2022-01-07 22:43 ` Lancelot SIX

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211126230038.103225-12-lsix@lancelotsix.com \
    --to=lsix@lancelotsix.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).