Fix annota-input-while-running.exp remote check

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.
This commit is contained in:
Simon Marchi 2016-05-02 13:04:42 -04:00
parent 1270fac69d
commit 740feeaa20
2 changed files with 12 additions and 19 deletions

View File

@ -1,3 +1,9 @@
2016-05-02 Simon Marchi <simon.marchi@ericsson.com>
* 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.
2016-04-28 Simon Marchi <simon.marchi@ericsson.com>
* gdb.trace/trace-enable-disable.exp: New file.

View File

@ -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." {