From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 2/4] Fix annota-input-while-running.exp remote check
Date: Wed, 06 Apr 2016 03:15:00 -0000 [thread overview]
Message-ID: <1459912543-15328-2-git-send-email-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <1459912543-15328-1-git-send-email-simon.marchi@polymtl.ca>
The comment says that we can't use runto_main here becore it doesn't
know how to handle annotation. Instead, the test puts a breakpoint at
main and calls run by hand. Therefore, it can't work with stub targets,
since they can't "run". The check should be then changed to check the
use_gdb_stub variable instead of [is_remote target].
But as an alternative, we can just use runto_main and enable annotations
after, since the "run to main" part is not really part of what we want
to test.
I also removed the "set test..." line that is unused.
gdb/testsuite/ChangeLog:
* gdb.base/annota-input-while-running.exp: Don't check for
[is_remote target]. Enable annotations after running to main.
Remove unused "set test..." line.
---
.../gdb.base/annota-input-while-running.exp | 25 ++++++----------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/gdb/testsuite/gdb.base/annota-input-while-running.exp b/gdb/testsuite/gdb.base/annota-input-while-running.exp
index 9a0ca84..adc96e4 100644
--- a/gdb/testsuite/gdb.base/annota-input-while-running.exp
+++ b/gdb/testsuite/gdb.base/annota-input-while-running.exp
@@ -16,23 +16,18 @@
# Test that annotations support doesn't leave GDB's terminal settings
# into effect when we run a foreground command.
-if [is_remote target] then {
- # We cannot use runto_main because of the different prompt we get
- # when using annotation level 2.
- return 0
-}
-
standard_testfile
if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug] == -1} {
return -1
}
-# Break at main
-
-gdb_test "break main" \
- "Breakpoint.*at.* file .*$srcfile.*\\." \
- "breakpoint main"
+# Because runto_main doesn't know how to handle the prompt with annotations,
+# run to main before we set the annotation level.
+if ![runto_main] then {
+- fail "Can't run to main"
+- return 1
+}
# NOTE: this prompt is OK only when the annotation level is > 1
# NOTE: When this prompt is in use the gdb_test procedure cannot be
@@ -59,16 +54,8 @@ proc gdb_annota_test {command pattern message} {
}
# Set the annotation level to 2.
-
-set test "annotation set at level 2"
gdb_annota_test "set annotate 2" ".*" "annotation set at level 2"
-# Run to main.
-
-gdb_annota_test "run" \
- "\r\n\032\032post-prompt.*\r\n\r\n\032\032stopped.*" \
- "run until main breakpoint"
-
set test "delete breakpoints"
gdb_test_multiple "delete" $test {
-re "Delete all breakpoints. .y or n." {
--
2.8.0
next prev parent reply other threads:[~2016-04-06 3:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 3:15 [PATCH 1/4] native-gdbserver: Clear isremote flag in board info Simon Marchi
2016-04-06 3:15 ` [PATCH 3/4] Fix detach.exp remote check Simon Marchi
2016-04-11 18:16 ` Pedro Alves
2016-05-02 17:11 ` Simon Marchi
2016-04-06 3:15 ` Simon Marchi [this message]
2016-04-11 18:03 ` [PATCH 2/4] Fix annota-input-while-running.exp " Pedro Alves
2016-05-02 17:07 ` Simon Marchi
2016-04-06 3:15 ` [PATCH 4/4] Fix solib-display.exp " Simon Marchi
2016-04-11 18:27 ` Pedro Alves
2016-04-11 19:26 ` Simon Marchi
2016-04-11 21:32 ` Pedro Alves
2016-04-11 21:38 ` Pedro Alves
2016-05-02 18:20 ` Simon Marchi
2016-05-02 18:28 ` Pedro Alves
2016-05-02 19:52 ` Simon Marchi
2016-05-03 23:19 ` Pedro Alves
2016-04-11 18:40 ` [PATCH 1/4] native-gdbserver: Clear isremote flag in board info Pedro Alves
2016-04-11 19:14 ` Simon Marchi
2016-04-11 21:29 ` Pedro Alves
2016-04-11 23:14 ` Simon Marchi
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=1459912543-15328-2-git-send-email-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--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).